summaryrefslogtreecommitdiff
path: root/clrfeatures.cmake
diff options
context:
space:
mode:
authorVictor "Nate" Graf <nategraf1@gmail.com>2018-01-02 17:47:20 (GMT)
committerGitHub <noreply@github.com>2018-01-02 17:47:20 (GMT)
commitc1bbdae7964b19b7063074d36e6af960f0cdc3a0 (patch)
treee554fc74fbb22c6ce9dd488fb02ba4f08ee89e89 /clrfeatures.cmake
parent35bba0c5b29e9dfd2744b09e577f6111ef7de9d7 (diff)
downloadcoreclr-c1bbdae7964b19b7063074d36e6af960f0cdc3a0.zip
coreclr-c1bbdae7964b19b7063074d36e6af960f0cdc3a0.tar.gz
coreclr-c1bbdae7964b19b7063074d36e6af960f0cdc3a0.tar.bz2
Retry: Enable EventPipe across Unix and Windows (#15611)
* Revert "Revert "Enable EventPipe across Unix and Windows (#14772)" (#15609)" This reverts commit 302005ca8ae14eade37ddf4ac6e900617c1c166a. * Fix ARM build break * Use more explicit references to resolve build failures * Fix compat with python3 * Disable FeaturePerfTracing on Windows as it is not ready * Disable test for incomplete functionality * Fix test diabled patterns * Add license header * Use keyword types for managed code * Add message prefix * More precisly condition generation of eventing sources * Remove erroneously added changes
Diffstat (limited to 'clrfeatures.cmake')
-rw-r--r--clrfeatures.cmake20
1 files changed, 5 insertions, 15 deletions
diff --git a/clrfeatures.cmake b/clrfeatures.cmake
index b4d7bad..367777a 100644
--- a/clrfeatures.cmake
+++ b/clrfeatures.cmake
@@ -3,23 +3,13 @@ if(CLR_CMAKE_TARGET_TIZEN_LINUX)
endif()
if(NOT DEFINED FEATURE_EVENT_TRACE)
- if (WIN32)
- set(FEATURE_EVENT_TRACE 1)
- endif()
-
- if(CLR_CMAKE_PLATFORM_LINUX)
- if(CLR_CMAKE_TARGET_TIZEN_LINUX)
- set(FEATURE_EVENT_TRACE 1)
- elseif(CLR_CMAKE_TARGET_ARCH_AMD64)
- set(FEATURE_EVENT_TRACE 1)
- elseif(CLR_CMAKE_TARGET_ARCH_ARM)
- set(FEATURE_EVENT_TRACE 1)
- elseif(CLR_CMAKE_TARGET_ARCH_ARM64)
- set(FEATURE_EVENT_TRACE 1)
- endif()
- endif(CLR_CMAKE_PLATFORM_LINUX)
+ set(FEATURE_EVENT_TRACE 1)
endif(NOT DEFINED FEATURE_EVENT_TRACE)
+if(NOT DEFINED FEATURE_PERFTRACING AND FEATURE_EVENT_TRACE)
+ set(FEATURE_PERFTRACING 1)
+endif(NOT DEFINED FEATURE_PERFTRACING AND FEATURE_EVENT_TRACE)
+
if(NOT DEFINED FEATURE_DBGIPC)
if(CLR_CMAKE_PLATFORM_UNIX AND (NOT CLR_CMAKE_PLATFORM_ANDROID))
set(FEATURE_DBGIPC 1)