summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonghyun Park <parjong@gmail.com>2017-04-18 03:21:45 +0900
committerDan Moseley <danmose@microsoft.com>2017-04-17 11:21:45 -0700
commit6097e8a7632ab2790d02302e6f722e168557a50f (patch)
tree8ebd6ce81a48c12e1eff260205acec5196c4025c
parentbd9cd4206ef5abb9b0a4741fc7d970b40bfed44b (diff)
downloadcoreclr-6097e8a7632ab2790d02302e6f722e168557a50f.tar.gz
coreclr-6097e8a7632ab2790d02302e6f722e168557a50f.tar.bz2
coreclr-6097e8a7632ab2790d02302e6f722e168557a50f.zip
Support FEATURE_EVENT_TRACE override (#10961)
-rw-r--r--clrdefinitions.cmake13
-rw-r--r--clrfeatures.cmake17
-rw-r--r--src/pal/CMakeLists.txt13
3 files changed, 19 insertions, 24 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake
index cb39e1f999..3f4122ac6e 100644
--- a/clrdefinitions.cmake
+++ b/clrdefinitions.cmake
@@ -4,18 +4,7 @@ else()
set(CLR_BUILD_JIT32 0)
endif()
-if (WIN32)
- set(FEATURE_EVENT_TRACE 1)
-endif()
-if(CLR_CMAKE_PLATFORM_LINUX)
- if(CLR_CMAKE_TARGET_ARCH_AMD64)
- set(FEATURE_EVENT_TRACE 1)
- elseif(CLR_CMAKE_TARGET_ARCH_ARM)
- if(NOT(CLR_CMAKE_TARGET_TIZEN_LINUX))
- set(FEATURE_EVENT_TRACE 1)
- endif()
- endif()
-endif()
+include(clrfeatures.cmake)
if (CLR_CMAKE_TARGET_ARCH_AMD64)
if (CLR_CMAKE_PLATFORM_UNIX)
diff --git a/clrfeatures.cmake b/clrfeatures.cmake
new file mode 100644
index 0000000000..0cbd585bb1
--- /dev/null
+++ b/clrfeatures.cmake
@@ -0,0 +1,17 @@
+if(CLR_CMAKE_TARGET_TIZEN_LINUX)
+ set(FEATURE_EVENT_TRACE 0)
+endif()
+
+if(NOT DEFINED FEATURE_EVENT_TRACE)
+ if (WIN32)
+ set(FEATURE_EVENT_TRACE 1)
+ endif()
+
+ if(CLR_CMAKE_PLATFORM_LINUX)
+ if(CLR_CMAKE_TARGET_ARCH_AMD64)
+ set(FEATURE_EVENT_TRACE 1)
+ elseif(CLR_CMAKE_TARGET_ARCH_ARM)
+ set(FEATURE_EVENT_TRACE 1)
+ endif()
+ endif(CLR_CMAKE_PLATFORM_LINUX)
+endif(NOT DEFINED FEATURE_EVENT_TRACE)
diff --git a/src/pal/CMakeLists.txt b/src/pal/CMakeLists.txt
index 453bddde6c..c687d832df 100644
--- a/src/pal/CMakeLists.txt
+++ b/src/pal/CMakeLists.txt
@@ -2,18 +2,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
project(COREPAL)
-if (WIN32)
- set(FEATURE_EVENT_TRACE 1)
-endif()
-if(CLR_CMAKE_PLATFORM_LINUX)
- if(CLR_CMAKE_TARGET_ARCH_AMD64)
- set(FEATURE_EVENT_TRACE 1)
- elseif(CLR_CMAKE_TARGET_ARCH_ARM)
- if(NOT(CLR_CMAKE_TARGET_TIZEN_LINUX))
- set(FEATURE_EVENT_TRACE 1)
- endif()
- endif()
-endif()
+include(../../clrfeatures.cmake)
include_directories(${COREPAL_SOURCE_DIR}/inc)
include_directories(${COREPAL_SOURCE_DIR}/src)