Reorganize CoreCLR native build to reduce CMake reconfigures when the build system is untouched (#49906)

6 files changed, 11 insertions, 20 deletions

diff --git a/src/coreclr/ToolBox/SOS/CMakeLists.txt b/src/coreclr/ToolBox/SOS/CMakeLists.txt
index 1474c5466f0..a8b51128947 100644
--- a/src/coreclr/ToolBox/SOS/CMakeLists.txt
+++ b/src/coreclr/ToolBox/SOS/CMakeLists.txt
@@ -1 +1 @@
-_install(FILES SOS_README.md DESTINATION .)
+install(FILES SOS_README.md DESTINATION .)
diff --git a/src/coreclr/ToolBox/superpmi/mcs/CMakeLists.txt b/src/coreclr/ToolBox/superpmi/mcs/CMakeLists.txt
index e928c48d0ca..56dcaff658c 100644
--- a/src/coreclr/ToolBox/superpmi/mcs/CMakeLists.txt
+++ b/src/coreclr/ToolBox/superpmi/mcs/CMakeLists.txt
@@ -47,7 +47,7 @@ set(MCS_SOURCES
     ../superpmi-shared/spmidumphelper.cpp
 )
 
-_add_executable(mcs
+add_executable_clr(mcs
     ${MCS_SOURCES}
 )
 target_precompile_headers(mcs PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:standardpch.h>")
@@ -66,7 +66,6 @@ else()
         ${STATIC_MT_CPP_LIB}
     )
 
-    _install (FILES $<TARGET_PDB_FILE:mcs> DESTINATION PDB)
 endif(CLR_CMAKE_HOST_UNIX)
 
-_install (TARGETS mcs DESTINATION .)
+install_clr(TARGETS mcs DESTINATIONS .)
diff --git a/src/coreclr/ToolBox/superpmi/superpmi-shim-collector/CMakeLists.txt b/src/coreclr/ToolBox/superpmi/superpmi-shim-collector/CMakeLists.txt
index 27ab46758f8..1eb640c4cb9 100644
--- a/src/coreclr/ToolBox/superpmi/superpmi-shim-collector/CMakeLists.txt
+++ b/src/coreclr/ToolBox/superpmi/superpmi-shim-collector/CMakeLists.txt
@@ -39,7 +39,7 @@ if (CLR_CMAKE_TARGET_WIN32)
     list(APPEND SUPERPMI_SHIM_COLLECTOR_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/superpmi-shim-collector.def)
 endif (CLR_CMAKE_TARGET_WIN32)
 
-_add_library(superpmi-shim-collector
+add_library_clr(superpmi-shim-collector
     SHARED
     ${SUPERPMI_SHIM_COLLECTOR_SOURCES}
 )
@@ -59,8 +59,6 @@ else()
         ${STATIC_MT_CRT_LIB}
         ${STATIC_MT_CPP_LIB}
     )
-
-    _install (FILES $<TARGET_PDB_FILE:superpmi-shim-collector> DESTINATION PDB)
 endif(CLR_CMAKE_HOST_UNIX)
 
-_install (PROGRAMS $<TARGET_FILE:superpmi-shim-collector> DESTINATION .)
+install_clr(TARGETS superpmi-shim-collector DESTINATIONS .)
diff --git a/src/coreclr/ToolBox/superpmi/superpmi-shim-counter/CMakeLists.txt b/src/coreclr/ToolBox/superpmi/superpmi-shim-counter/CMakeLists.txt
index 57a42a5ba03..602a6751b02 100644
--- a/src/coreclr/ToolBox/superpmi/superpmi-shim-counter/CMakeLists.txt
+++ b/src/coreclr/ToolBox/superpmi/superpmi-shim-counter/CMakeLists.txt
@@ -41,7 +41,7 @@ if (CLR_CMAKE_TARGET_WIN32)
     list(APPEND SUPERPMI_SHIM_COUNTER_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/superpmi-shim-counter.def)
 endif (CLR_CMAKE_TARGET_WIN32)
 
-_add_library(superpmi-shim-counter
+add_library_clr(superpmi-shim-counter
     SHARED
     ${SUPERPMI_SHIM_COUNTER_SOURCES}
 )
@@ -61,8 +61,6 @@ else()
         ${STATIC_MT_CRT_LIB}
         ${STATIC_MT_CPP_LIB}
     )
-
-    _install (FILES $<TARGET_PDB_FILE:superpmi-shim-counter> DESTINATION PDB)
 endif(CLR_CMAKE_HOST_UNIX)
 
-_install (PROGRAMS $<TARGET_FILE:superpmi-shim-counter> DESTINATION .)
+install_clr(TARGETS superpmi-shim-counter DESTINATIONS .)
diff --git a/src/coreclr/ToolBox/superpmi/superpmi-shim-simple/CMakeLists.txt b/src/coreclr/ToolBox/superpmi/superpmi-shim-simple/CMakeLists.txt
index 58afa789de1..b6f4d52ea4c 100644
--- a/src/coreclr/ToolBox/superpmi/superpmi-shim-simple/CMakeLists.txt
+++ b/src/coreclr/ToolBox/superpmi/superpmi-shim-simple/CMakeLists.txt
@@ -40,7 +40,7 @@ if (CLR_CMAKE_TARGET_WIN32)
     list(APPEND SUPERPMI_SHIM_SIMPLE_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/superpmi-shim-simple.def)
 endif (CLR_CMAKE_TARGET_WIN32)
 
-_add_library(superpmi-shim-simple
+add_library_clr(superpmi-shim-simple
     SHARED
     ${SUPERPMI_SHIM_SIMPLE_SOURCES}
 )
@@ -60,8 +60,6 @@ else()
         ${STATIC_MT_CRT_LIB}
         ${STATIC_MT_CPP_LIB}
     )
-
-    _install (FILES $<TARGET_PDB_FILE:superpmi-shim-simple> DESTINATION PDB)
 endif(CLR_CMAKE_HOST_UNIX)
 
-_install (PROGRAMS $<TARGET_FILE:superpmi-shim-simple> DESTINATION .)
+install_clr(TARGETS superpmi-shim-simple DESTINATIONS .)
diff --git a/src/coreclr/ToolBox/superpmi/superpmi/CMakeLists.txt b/src/coreclr/ToolBox/superpmi/superpmi/CMakeLists.txt
index 3bc6ca86557..92cda6d5600 100644
--- a/src/coreclr/ToolBox/superpmi/superpmi/CMakeLists.txt
+++ b/src/coreclr/ToolBox/superpmi/superpmi/CMakeLists.txt
@@ -41,7 +41,7 @@ set(SUPERPMI_SOURCES
     ../superpmi-shared/spmidumphelper.cpp
 )
 
-_add_executable(superpmi
+add_executable_clr(superpmi
     ${SUPERPMI_SOURCES}
 )
 
@@ -61,8 +61,6 @@ else()
         ${STATIC_MT_CRT_LIB}
         ${STATIC_MT_CPP_LIB}
     )
-
-    _install (FILES $<TARGET_PDB_FILE:superpmi> DESTINATION PDB)
 endif(CLR_CMAKE_HOST_UNIX)
 
-_install (TARGETS superpmi DESTINATION .)
+install_clr(TARGETS superpmi DESTINATIONS .)