summaryrefslogtreecommitdiff
path: root/src/pal/src/CMakeLists.txt
diff options
context:
space:
mode:
authorJeremy Koritzinsky <jkoritzinsky@gmail.com>2019-06-06 14:43:54 -0700
committerGitHub <noreply@github.com>2019-06-06 14:43:54 -0700
commit4c82068adb046eee3573984392a0d1e774062ae0 (patch)
treec94ee1b120f165f121101b7dc368fa2c57dd5f0a /src/pal/src/CMakeLists.txt
parent2e9cd827b0db60ad42f7df1f34ee1fada1951e5f (diff)
downloadcoreclr-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/pal/src/CMakeLists.txt')
-rw-r--r--src/pal/src/CMakeLists.txt22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt
index 28f5bfb41d..6d8d92f0eb 100644
--- a/src/pal/src/CMakeLists.txt
+++ b/src/pal/src/CMakeLists.txt
@@ -123,25 +123,25 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
)
endif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-add_definitions(-DPLATFORM_UNIX=1)
-add_definitions(-DLP64COMPATIBLE=1)
-add_definitions(-DFEATURE_PAL=1)
-add_definitions(-DCORECLR=1)
-add_definitions(-DPIC=1)
+add_definitions(-DPLATFORM_UNIX)
+add_definitions(-DLP64COMPATIBLE)
+add_definitions(-DFEATURE_PAL)
+add_definitions(-DCORECLR)
+add_definitions(-DPIC)
add_definitions(-D_FILE_OFFSET_BITS=64)
if(PAL_CMAKE_PLATFORM_ARCH_AMD64)
- add_definitions(-DBIT64=1)
- add_definitions(-D_WIN64=1)
+ add_definitions(-DBIT64)
+ add_definitions(-D_WIN64)
set(PAL_ARCH_SOURCES_DIR amd64)
elseif(PAL_CMAKE_PLATFORM_ARCH_ARM)
- add_definitions(-DBIT32=1)
+ add_definitions(-DBIT32)
set(PAL_ARCH_SOURCES_DIR arm)
elseif(PAL_CMAKE_PLATFORM_ARCH_ARM64)
- add_definitions(-DBIT64=1)
- add_definitions(-D_WIN64=1)
+ add_definitions(-DBIT64)
+ add_definitions(-D_WIN64)
set(PAL_ARCH_SOURCES_DIR arm64)
elseif(PAL_CMAKE_PLATFORM_ARCH_I386)
- add_definitions(-DBIT32=1)
+ add_definitions(-DBIT32)
set(PAL_ARCH_SOURCES_DIR i386)
endif()