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

1 files changed, 17 insertions, 9 deletions

diff --git a/src/coreclr/crosscomponents.cmake b/src/coreclr/crosscomponents.cmake
index c66531887da..e8d51914951 100644
--- a/src/coreclr/crosscomponents.cmake
+++ b/src/coreclr/crosscomponents.cmake
@@ -1,31 +1,39 @@
-add_definitions(-DCROSS_COMPILE)
-
-if(CLR_CMAKE_HOST_ARCH_AMD64 AND (CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_I386))
-    set(FEATURE_CROSSBITNESS 1)
-endif(CLR_CMAKE_HOST_ARCH_AMD64 AND (CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_I386))
+# Add targets to the crosscomponents subcomponent build
 
 if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS)
-    set (CLR_CROSS_COMPONENTS_LIST
+    install_clr (TARGETS
         clrjit
         jitinterface_${ARCH_HOST_NAME}
+        DESTINATIONS .
+        COMPONENT crosscomponents
     )
 
     if(CLR_CMAKE_HOST_LINUX OR NOT FEATURE_CROSSBITNESS)
-        list (APPEND CLR_CROSS_COMPONENTS_LIST
+        install_clr (TARGETS
             crossgen
+            DESTINATIONS .
+            COMPONENT crosscomponents
         )
     endif()
 
     if (CLR_CMAKE_TARGET_UNIX)
-        list (APPEND CLR_CROSS_COMPONENTS_LIST
+        install_clr (TARGETS
             clrjit_unix_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
+            DESTINATIONS .
+            COMPONENT crosscomponents
         )
     endif(CLR_CMAKE_TARGET_UNIX)
 endif()
 
 if(NOT CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_OSX AND NOT FEATURE_CROSSBITNESS)
-    list (APPEND CLR_CROSS_COMPONENTS_LIST
+    install_clr (TARGETS
         mscordaccore
         mscordbi
+        DESTINATIONS .
+        COMPONENT crosscomponents
     )
 endif()
+
+if (CLR_CMAKE_TARGET_WIN32 AND NOT CLR_CMAKE_CROSS_ARCH)
+    add_dependencies(crosscomponents InjectResource GenClrDebugResource)
+endif()