diff options
| author | Jeremy Koritzinsky <jkoritzinsky@gmail.com> | 2019-06-06 14:43:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 14:43:54 -0700 |
| commit | 4c82068adb046eee3573984392a0d1e774062ae0 (patch) | |
| tree | c94ee1b120f165f121101b7dc368fa2c57dd5f0a /src/gc | |
| parent | 2e9cd827b0db60ad42f7df1f34ee1fada1951e5f (diff) | |
| download | coreclr-4c82068adb046eee3573984392a0d1e774062ae0.tar.gz coreclr-4c82068adb046eee3573984392a0d1e774062ae0.tar.bz2 coreclr-4c82068adb046eee3573984392a0d1e774062ae0.zip | |
Use CMake's C# support to build DacTableGen instead of manually invoking csc.exe ourselves. (#24342)
* Use CMake's C# support to build DacTableGen instead of manually invoking csc.exe ourselves.
* Fix x86 failures.
* Disable DAC generation when building with NMake Makefiles and issue an error since the CMake C# support is VS-only. We don't actually support building with NMake (only configure) so this is ok.
* Clean up rest of the macro=1's
PR Feedback.
* Fix Visual Studio generator matching.
* Explicitly specify anycpu32bitpreferred for DacTableGen so the ARM64 build doesn't accidentally make it 64-bit
* Fix bad merge
Diffstat (limited to 'src/gc')
| -rw-r--r-- | src/gc/sample/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gc/sample/CMakeLists.txt b/src/gc/sample/CMakeLists.txt index 6eb4b27f22..7dbb0540d1 100644 --- a/src/gc/sample/CMakeLists.txt +++ b/src/gc/sample/CMakeLists.txt @@ -35,7 +35,7 @@ endif(WIN32) if(WIN32) list(APPEND SOURCES ../windows/gcenv.windows.cpp) - add_definitions(-DUNICODE=1) + add_definitions(-DUNICODE) else() list(APPEND SOURCES ../gcenv.unix.cpp) @@ -47,4 +47,4 @@ _add_executable(gcsample if(WIN32) target_link_libraries(gcsample ${GC_LINK_LIBRARIES}) -endif()
\ No newline at end of file +endif() |