From 617e1311f42be82fcf3a1a9f6e9218cfaa1de8bf Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Fri, 29 Apr 2016 19:34:36 +0900 Subject: Ensure FEATURE_MANAGED_ETW isn't set for TargetUnix 2 The commit 82492f7fe7d91331508cb1bf9b33e2e9725d9898 has disabled FEATURE_MANAGED_ETW for UNIX builds. However, the commit somehow omitted updating CMakeList accordingly while updating msbuild scripts. This patch does the same for CMake scripts. Fixes #4682 part 1. Signed-off-by: MyungJoo Ham --- clrdefinitions.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'clrdefinitions.cmake') diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index bc39e108c4..7f3dfc5dd9 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) -- cgit v1.2.3 From 8d55cd34e8192ac9679e7f1b34b0b1709154c943 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Mon, 2 May 2016 10:58:49 +0900 Subject: Disable WIN32_REGISTRY for UNIX platforms Unlike managed build scripts, FEATURE_WIN32_REGISTRY has been enabled for UNIX-like systems in CMake native build scripts. Fix #4682 part 3. Signed-off-by: MyungJoo Ham --- clrdefinitions.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'clrdefinitions.cmake') diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index 7f3dfc5dd9..a53708ebcd 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -183,7 +183,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) -- cgit v1.2.3