Install binaries that are part of shared framework into separa… (#27841)

* Change the install_clr command to use cmake_parse_arguments to make it easier to extend and easier to read.

Add additional install_clr commands to install the files that go into the shared framework into the sharedFramework folder.

* Install SOS README.

* Collapse conditions. Output message explaining that we're reading the native version out of the native version header so in the case that the header doesn't exist we get something actionable.

Author: jkoritzinsky

functions.cmake

@@ -285,27 +285,43 @@ function(strip_symbols targetName outputFilename)
   endif(CLR_CMAKE_PLATFORM_UNIX)
 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)
-
-    # We don't need to install the export libraries for our DLLs
-    # since they won't be directly linked against.
-    install(PROGRAMS $<TARGET_FILE:${targetName}> DESTINATION .)
-    if(WIN32)
-        # We can't use the $<TARGET_PDB_FILE> generator expression here since
-        # the generator expression isn't supported on resource DLLs.
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${targetName}.pdb DESTINATION PDB)
-    else()
-        install(FILES ${strip_destination_file} DESTINATION .)
-    endif()
-    if(CLR_CMAKE_PGO_INSTRUMENT)
+# install_clr(TARGETS TARGETS targetName [targetName2 ...] [DESTINATION destination])
+function(install_clr)
+  set(options "")
+  set(oneValueArgs DESTINATION)
+  set(multiValueArgs TARGETS)
+  cmake_parse_arguments(PARSE_ARGV 0 INSTALL_CLR "${options}" "${oneValueArgs}" "${multiValueArgs}")
+
+  if ("${INSTALL_CLR_TARGETS}" STREQUAL "")
+    message(FATAL_ERROR "At least one target must be passed to install_clr(TARGETS )")
+  endif()
+
+  if ("${INSTALL_CLR_DESTINATION}" STREQUAL "")
+    set(INSTALL_CLR_DESTINATION ".")
+  endif()
+
+  foreach(targetName ${INSTALL_CLR_TARGETS})
+    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)
+
+        # We don't need to install the export libraries for our DLLs
+        # since they won't be directly linked against.
+        install(PROGRAMS $<TARGET_FILE:${targetName}> DESTINATION ${INSTALL_CLR_DESTINATION})
         if(WIN32)
-            install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${targetName}.pgd DESTINATION PGD OPTIONAL)
+            # We can't use the $<TARGET_PDB_FILE> generator expression here since
+            # the generator expression isn't supported on resource DLLs.
+            install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${targetName}.pdb DESTINATION ${INSTALL_CLR_DESTINATION}/PDB)
+        else()
+            install(FILES ${strip_destination_file} DESTINATION ${INSTALL_CLR_DESTINATION})
+        endif()
+        if(CLR_CMAKE_PGO_INSTRUMENT)
+            if(WIN32)
+                install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${targetName}.pgd DESTINATION ${INSTALL_CLR_DESTINATION}/PGD OPTIONAL)
+            endif()
         endif()
     endif()
-  endif()
+  endforeach()
 endfunction()
 
 # Disable PAX mprotect that would prevent JIT and other codegen in coreclr from working.

src/ToolBox/SOS/CMakeLists.txt

@@ -5,3 +5,4 @@ if(WIN32)
 endif(WIN32)
 
 _install(FILES SOS_README.md DESTINATION .)
+_install(FILES SOS_README.md DESTINATION sharedFramework)

src/coreclr/hosts/coreconsole/CMakeLists.txt

@@ -28,6 +28,6 @@ else()
     )
 
     # Can't compile on linux yet so only add for windows
-    install_clr(CoreConsole)
+    install_clr(TARGETS CoreConsole)
 
-endif(CLR_CMAKE_PLATFORM_UNIX)
+endif(CLR_CMAKE_PLATFORM_UNIX)

src/coreclr/hosts/corerun/CMakeLists.txt

@@ -33,6 +33,6 @@ else()
     )
 
     # Can't compile on linux yet so only add for windows
-    install_clr(CoreRun)
+    install_clr(TARGETS CoreRun)
 
-endif(CLR_CMAKE_PLATFORM_UNIX)
+endif(CLR_CMAKE_PLATFORM_UNIX)

src/coreclr/hosts/coreshim/CMakeLists.txt

@@ -22,4 +22,4 @@ target_link_libraries(CoreShim
     ${STATIC_MT_VCRT_LIB}
 )
 
-install_clr(CoreShim)
+install_clr(TARGETS CoreShim)

src/coreclr/hosts/osxbundlerun/CMakeLists.txt

@@ -19,4 +19,4 @@ add_dependencies(osxbundlerun
     coreclr
 )
 
-install_clr(osxbundlerun)
+install_clr(TARGETS osxbundlerun)

src/coreclr/hosts/unixcoreconsole/CMakeLists.txt

@@ -29,4 +29,4 @@ if(NOT CLR_CMAKE_PLATFORM_ANDROID)
   )
 endif()
 
-install_clr(coreconsole)
+install_clr(TARGETS coreconsole)

src/coreclr/hosts/unixcorerun/CMakeLists.txt

@@ -30,4 +30,4 @@ if(NOT CLR_CMAKE_PLATFORM_ANDROID)
   )
 endif()
 
-install_clr(corerun)
+install_clr(TARGETS corerun)

src/corefx/System.Globalization.Native/CMakeLists.txt

@@ -92,5 +92,6 @@ verify_dependencies(
 )
 
 # add the install targets
-install_clr(System.Globalization.Native)
+install_clr(TARGETS System.Globalization.Native)
+install_clr(TARGETS System.Globalization.Native DESTINATION sharedFramework)
 install(TARGETS System.Globalization.Native_Static DESTINATION .)

src/debug/createdump/CMakeLists.txt

@@ -48,4 +48,4 @@ target_link_libraries(createdump
 
 add_dependencies(createdump mscordaccore)
 
-install_clr(createdump)
+install_clr(TARGETS createdump)