diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-05-02 11:05:17 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-05-02 11:05:17 -0700 |
| commit | a91aee5ca088e5d80835fc593d72d9cacd5d7480 (patch) | |
| tree | 6279f1c7af18c4fd5d0561b0db4548be46d03028 /clrdefinitions.cmake | |
| parent | 7dd56b48bd99a776e8e7dd3638f59191c5013e9b (diff) | |
| parent | 8d55cd34e8192ac9679e7f1b34b0b1709154c943 (diff) | |
| download | coreclr-a91aee5ca088e5d80835fc593d72d9cacd5d7480.tar.gz coreclr-a91aee5ca088e5d80835fc593d72d9cacd5d7480.tar.bz2 coreclr-a91aee5ca088e5d80835fc593d72d9cacd5d7480.zip | |
Merge pull request #4709 from myungjoo/fix/4682
Match Inconsistent CMake/MSBuild Compiler Definitions
Diffstat (limited to 'clrdefinitions.cmake')
| -rw-r--r-- | clrdefinitions.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index c5352c0482..9a1d3df148 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -126,7 +126,9 @@ if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64) endif(CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64) add_definitions(-DFEATURE_ISYM_READER) add_definitions(-DFEATURE_LOADER_OPTIMIZATION) +if (NOT CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_MANAGED_ETW) +endif(NOT CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS) add_definitions(-DFEATURE_MAIN_CLR_MODULE_USES_CORE_NAME) add_definitions(-DFEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE) @@ -180,7 +182,9 @@ add_definitions(-DFEATURE_VERSIONING) if(WIN32) add_definitions(-DFEATURE_VERSIONING_LOG) endif(WIN32) -add_definitions(-DFEATURE_WIN32_REGISTRY) +if(NOT CLR_CMAKE_PLATFORM_UNIX) + add_definitions(-DFEATURE_WIN32_REGISTRY) +endif(NOT CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_WINDOWSPHONE) add_definitions(-DFEATURE_WINMD_RESILIENT) add_definitions(-D_SECURE_SCL=0) |