Revert "Enable EventPipe across Unix and Windows (#14772)" (#15609)

This reverts commit 7524d72d4f0f634fe5407280b83c25181dc8c556.

1 files changed, 35 insertions, 33 deletions

diff --git a/functions.cmake b/functions.cmake
index c2286839dd..15d0cd929c 100644
--- a/functions.cmake
+++ b/functions.cmake
@@ -44,11 +44,11 @@ endfunction(get_include_directories)
 # Build a list of include directories for consumption by the assembler
 function(get_include_directories_asm IncludeDirectories)
     get_directory_property(dirs INCLUDE_DIRECTORIES)
-
+    
     if (CLR_CMAKE_PLATFORM_ARCH_ARM AND WIN32)
         list(APPEND INC_DIRECTORIES "-I ")
     endif()
-
+    
     foreach(dir IN LISTS dirs)
       if (CLR_CMAKE_PLATFORM_ARCH_ARM AND WIN32)
         list(APPEND INC_DIRECTORIES ${dir};)
@@ -141,7 +141,7 @@ function(strip_symbols targetName outputFilename)
         add_custom_command(
           TARGET ${targetName}
           POST_BUILD
-          VERBATIM
+          VERBATIM 
           COMMAND ${DSYMUTIL} --flat --minimize ${strip_source_file}
           COMMAND ${STRIP} -S ${strip_source_file}
           COMMENT Stripping symbols from ${strip_source_file} into file ${strip_destination_file}
@@ -152,7 +152,7 @@ function(strip_symbols targetName outputFilename)
         add_custom_command(
           TARGET ${targetName}
           POST_BUILD
-          VERBATIM
+          VERBATIM 
           COMMAND ${OBJCOPY} --only-keep-debug ${strip_source_file} ${strip_destination_file}
           COMMAND ${OBJCOPY} --strip-debug ${strip_source_file}
           COMMAND ${OBJCOPY} --add-gnu-debuglink=${strip_destination_file} ${strip_source_file}
@@ -166,30 +166,30 @@ function(strip_symbols targetName outputFilename)
 endfunction()
 
 function(install_clr targetName)
-  list(FIND CLR_CROSS_COMPONENTS_LIST ${targetName} INDEX)
-  if (NOT DEFINED CLR_CROSS_COMPONENTS_LIST OR NOT ${INDEX} EQUAL -1)
-    strip_symbols(${targetName} strip_destination_file)
-    # On the older version of cmake (2.8.12) used on Ubuntu 14.04 the TARGET_FILE
-    # generator expression doesn't work correctly returning the wrong path and on
-    # the newer cmake versions the LOCATION property isn't supported anymore.
-    if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0)
-       set(install_source_file $<TARGET_FILE:${targetName}>)
-    else()
-        get_property(install_source_file TARGET ${targetName} PROPERTY LOCATION)
-    endif()
-
-    install(PROGRAMS ${install_source_file} DESTINATION .)
-    if(WIN32)
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${targetName}.pdb DESTINATION PDB)
-    else()
-        install(FILES ${strip_destination_file} DESTINATION .)
-    endif()
+  list(FIND CLR_CROSS_COMPONENTS_LIST ${targetName} INDEX)  
+  if (NOT DEFINED CLR_CROSS_COMPONENTS_LIST OR NOT ${INDEX} EQUAL -1)  
+    strip_symbols(${targetName} strip_destination_file) 
+    # On the older version of cmake (2.8.12) used on Ubuntu 14.04 the TARGET_FILE  
+    # generator expression doesn't work correctly returning the wrong path and on  
+    # the newer cmake versions the LOCATION property isn't supported anymore.  
+    if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0)  
+       set(install_source_file $<TARGET_FILE:${targetName}>)  
+    else()  
+        get_property(install_source_file TARGET ${targetName} PROPERTY LOCATION)  
+    endif()  
+  
+    install(PROGRAMS ${install_source_file} DESTINATION .)  
+    if(WIN32)  
+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${targetName}.pdb DESTINATION PDB)  
+    else()  
+        install(FILES ${strip_destination_file} DESTINATION .)  
+    endif()  
     if(CLR_CMAKE_PGO_INSTRUMENT)
         if(WIN32)
             install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${targetName}.pgd DESTINATION PGD OPTIONAL)
         endif()
     endif()
-  endif()
+  endif()  
 endfunction()
 
 # Disable PAX mprotect that would prevent JIT and other codegen in coreclr from working.
@@ -217,11 +217,11 @@ function(_add_executable)
     else()
       add_executable(${ARGV})
     endif(NOT WIN32)
-    list(FIND CLR_CROSS_COMPONENTS_LIST ${ARGV0} INDEX)
-    if (DEFINED CLR_CROSS_COMPONENTS_LIST AND ${INDEX} EQUAL -1)
-     set_target_properties(${ARGV0} PROPERTIES EXCLUDE_FROM_ALL 1)
+    list(FIND CLR_CROSS_COMPONENTS_LIST ${ARGV0} INDEX)  
+    if (DEFINED CLR_CROSS_COMPONENTS_LIST AND ${INDEX} EQUAL -1)  
+     set_target_properties(${ARGV0} PROPERTIES EXCLUDE_FROM_ALL 1)  
     endif()
-endfunction()
+endfunction()  
 
 function(_add_library)
     if(NOT WIN32)
@@ -229,10 +229,10 @@ function(_add_library)
     else()
       add_library(${ARGV})
     endif(NOT WIN32)
-    list(FIND CLR_CROSS_COMPONENTS_LIST ${ARGV0} INDEX)
-    if (DEFINED CLR_CROSS_COMPONENTS_LIST AND ${INDEX} EQUAL -1)
-     set_target_properties(${ARGV0} PROPERTIES EXCLUDE_FROM_ALL 1)
-    endif()
+    list(FIND CLR_CROSS_COMPONENTS_LIST ${ARGV0} INDEX)  
+    if (DEFINED CLR_CROSS_COMPONENTS_LIST AND ${INDEX} EQUAL -1)  
+     set_target_properties(${ARGV0} PROPERTIES EXCLUDE_FROM_ALL 1)  
+    endif()  
 endfunction()
 
 function(_install)
@@ -263,8 +263,8 @@ function(verify_dependencies targetName errorMessage)
             TARGET ${targetName}
             POST_BUILD
             VERBATIM
-            COMMAND ${CMAKE_SOURCE_DIR}/verify-so.sh
-                $<TARGET_FILE:${targetName}>
+            COMMAND ${CMAKE_SOURCE_DIR}/verify-so.sh 
+                $<TARGET_FILE:${targetName}> 
                 ${errorMessage}
             COMMENT "Verifying ${targetName} dependencies"
         )
@@ -273,8 +273,10 @@ endfunction()
 
 function(add_library_clr)
     _add_library(${ARGV})
+    add_dependencies(${ARGV0} GeneratedEventingFiles)
 endfunction()
 
 function(add_executable_clr)
     _add_executable(${ARGV})
+    add_dependencies(${ARGV0} GeneratedEventingFiles)
 endfunction()