diff options
| author | Adeel Mujahid <adeelbm@outlook.com> | 2020-02-06 03:50:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 03:50:05 +0300 |
| commit | 34f316ea0651dd36c827648bdb88128e89b552d7 (patch) | |
| tree | ac8d5165211e0c3cfeeb5e36b6a45f9c43c56c87 /src/coreclr/clrdefinitions.cmake | |
| parent | d491056751496d997dfaa693575190508a0c3cf6 (diff) | |
Use common CLR_CMAKE_* variables in more places (#31659)
* Use common CLR_CMAKE_* variables in more places
* Remove obsolete paragraph from README
Diffstat (limited to 'src/coreclr/clrdefinitions.cmake')
| -rw-r--r-- | src/coreclr/clrdefinitions.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index d926f9724a2..e0126139f0f 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -6,7 +6,7 @@ set(PRERELEASE 1) # Features we're currently flighting, but don't intend to ship in officially supported releases if (PRERELEASE) - add_definitions(-DFEATURE_UTF8STRING) + add_definitions(-DFEATURE_UTF8STRING) # add_definitions(-DFEATURE_XXX) endif (PRERELEASE) @@ -22,11 +22,11 @@ if (CLR_CMAKE_TARGET_ARCH_ARM64) endif() add_definitions(-DFEATURE_MULTIREG_RETURN) elseif (CLR_CMAKE_TARGET_ARCH_ARM) - if (WIN32 AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) + if (CLR_CMAKE_HOST_WIN32 AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) # Set this to ensure we can use Arm SDK for Desktop binary linkage when doing native (Arm32) build add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE) add_definitions(-D_ARM_WORKAROUND_) - endif (WIN32 AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) + endif (CLR_CMAKE_HOST_WIN32 AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) add_definitions(-DFEATURE_EMULATE_SINGLESTEP) endif (CLR_CMAKE_TARGET_ARCH_ARM64) @@ -58,14 +58,14 @@ add_definitions(-DDEBUGGING_SUPPORTED) add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:DAC_COMPONENT>>>:PROFILING_SUPPORTED>) add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:DAC_COMPONENT>>:PROFILING_SUPPORTED_DATA>) -if(WIN32) +if(CLR_CMAKE_HOST_WIN32) add_definitions(-DWIN32) add_definitions(-D_WIN32) add_definitions(-DWINVER=0x0602) add_definitions(-D_WIN32_WINNT=0x0602) add_definitions(-DWIN32_LEAN_AND_MEAN) add_definitions(-D_CRT_SECURE_NO_WARNINGS) -endif(WIN32) +endif(CLR_CMAKE_HOST_WIN32) if(CLR_CMAKE_TARGET_WIN32) if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) # Only enable edit and continue on windows x86 and x64 @@ -134,9 +134,9 @@ if(CLR_CMAKE_TARGET_UNIX) add_definitions(-DFEATURE_EVENTSOURCE_XPLAT) endif(CLR_CMAKE_TARGET_UNIX) # NetBSD doesn't implement this feature -if(NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) +if(NOT CLR_CMAKE_TARGET_NETBSD) add_definitions(-DFEATURE_HIJACK) -endif(NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) +endif(NOT CLR_CMAKE_TARGET_NETBSD) add_definitions(-DFEATURE_ICASTABLE) if (CLR_CMAKE_TARGET_WIN32 AND (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_ARM64)) add_definitions(-DFEATURE_INTEROP_DEBUGGING) |