Don't build and publish libcoreclr libeventprovider libeventpipe as crosscomponents...

* Use _install to stop copying sosdocsunix.txt to crosscomponents directory in src/ToolBox/SOS/Strike/CMakeLists.txt
* Use _install for coreclrpal in src/pal/src/CMakeLists.txt
* Use _install for eventprovider in src/scripts/genLttngProvider.py
* Unconditionally use add_library_clr and _install for eventpipe in src/scripts/genEventPipe.py

Commit migrated from https://github.com/dotnet/coreclr/commit/14802fcc27eefbc29fbcb204cd0f3ae626da2042

diff --git a/src/coreclr/src/ToolBox/SOS/Strike/CMakeLists.txt b/src/coreclr/src/ToolBox/SOS/Strike/CMakeLists.txt
index bd34ff9..e1673bc 100644 (file)
--- a/src/coreclr/src/ToolBox/SOS/Strike/CMakeLists.txt
+++ b/src/coreclr/src/ToolBox/SOS/Strike/CMakeLists.txt
@@ -220,5 +220,5 @@ target_link_libraries(sos ${SOS_LIBRARY})
 install_clr(sos)
 
 if(NOT WIN32)
-  install(FILES sosdocsunix.txt DESTINATION .)
+  _install(FILES sosdocsunix.txt DESTINATION .)
 endif(NOT WIN32)

diff --git a/src/coreclr/src/pal/src/CMakeLists.txt b/src/coreclr/src/pal/src/CMakeLists.txt
index a3cc603..baa4a44 100644 (file)
--- a/src/coreclr/src/pal/src/CMakeLists.txt
+++ b/src/coreclr/src/pal/src/CMakeLists.txt
@@ -396,4 +396,4 @@ if(FEATURE_EVENT_TRACE)
 endif(FEATURE_EVENT_TRACE)
 
 # Install the static PAL library for VS
-install (TARGETS coreclrpal DESTINATION lib)
+_install (TARGETS coreclrpal DESTINATION lib)

diff --git a/src/coreclr/src/scripts/genEventPipe.py b/src/coreclr/src/scripts/genEventPipe.py
index a8d8918..59f5d71 100644 (file)
--- a/src/coreclr/src/scripts/genEventPipe.py
+++ b/src/coreclr/src/scripts/genEventPipe.py
@@ -249,12 +249,8 @@ def generateEventPipeCmakeFile(etwmanifest, eventpipe_directory, extern):
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 include_directories(${CLR_DIR}/src/vm)
 
+add_library_clr(eventpipe STATIC
 """)
-        if extern: cmake_file.write("add_library")
-        else: cmake_file.write("add_library_clr")
-        cmake_file.write("""(eventpipe
-    STATIC\n""")
-
         for providerNode in tree.getElementsByTagName('provider'):
             providerName = providerNode.getAttribute('name')
             providerName = providerName.replace("Windows-", '')
@@ -268,7 +264,7 @@ include_directories(${CLR_DIR}/src/vm)
         if extern: cmake_file.write("""
 
 # Install the static eventpipe library
-install(TARGETS eventpipe DESTINATION lib)
+_install(TARGETS eventpipe DESTINATION lib)
 """)
 
 def generateEventPipeHelperFile(etwmanifest, eventpipe_directory, extern):

diff --git a/src/coreclr/src/scripts/genLttngProvider.py b/src/coreclr/src/scripts/genLttngProvider.py
index 296042b..dfbd68d 100644 (file)
--- a/src/coreclr/src/scripts/genLttngProvider.py
+++ b/src/coreclr/src/scripts/genLttngProvider.py
@@ -521,7 +521,7 @@ def generateLttngFiles(etwmanifest,eventprovider_directory):
         add_subdirectory(tracepointprovider)
 
         # Install the static eventprovider library
-        install(TARGETS eventprovider DESTINATION lib)
+        _install(TARGETS eventprovider DESTINATION lib)
         """)
 
 #TracepointProvider  Cmake