From c1bbdae7964b19b7063074d36e6af960f0cdc3a0 Mon Sep 17 00:00:00 2001 From: "Victor \"Nate\" Graf" Date: Tue, 2 Jan 2018 09:47:20 -0800 Subject: 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 --- clrfeatures.cmake | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'clrfeatures.cmake') diff --git a/clrfeatures.cmake b/clrfeatures.cmake index b4d7bad2dd..367777a501 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) -- cgit v1.2.3