diff --git a/src/coreclr/crosscomponents.cmake b/src/coreclr/crosscomponents.cmake index e8d51914951e33..03b076becfb6d6 100644 --- a/src/coreclr/crosscomponents.cmake +++ b/src/coreclr/crosscomponents.cmake @@ -1,6 +1,11 @@ # Add targets to the crosscomponents subcomponent build if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS) + install_clr (TARGETS + clrjit + DESTINATIONS . sharedFramework + COMPONENT crosscomponents + ) install_clr (TARGETS clrjit jitinterface_${ARCH_HOST_NAME} @@ -11,7 +16,7 @@ if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS) if(CLR_CMAKE_HOST_LINUX OR NOT FEATURE_CROSSBITNESS) install_clr (TARGETS crossgen - DESTINATIONS . + DESTINATIONS . sharedFramework COMPONENT crosscomponents ) endif() @@ -19,7 +24,7 @@ if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS) if (CLR_CMAKE_TARGET_UNIX) install_clr (TARGETS clrjit_unix_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME} - DESTINATIONS . + DESTINATIONS . sharedFramework COMPONENT crosscomponents ) endif(CLR_CMAKE_TARGET_UNIX) @@ -29,7 +34,7 @@ if(NOT CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_OSX AND NOT FEATURE_CROSSBITN install_clr (TARGETS mscordaccore mscordbi - DESTINATIONS . + DESTINATIONS . sharedFramework COMPONENT crosscomponents ) endif() diff --git a/src/coreclr/dlls/mscordac/CMakeLists.txt b/src/coreclr/dlls/mscordac/CMakeLists.txt index 327560a030db20..9dd3329a230487 100644 --- a/src/coreclr/dlls/mscordac/CMakeLists.txt +++ b/src/coreclr/dlls/mscordac/CMakeLists.txt @@ -210,5 +210,8 @@ if(CLR_CMAKE_HOST_WIN32) string(REGEX MATCH "#define VER_FILEVERSION[ \t]+[0-9]+(,[0-9]+)+" FILE_VERSION_LINE "${NATIVE_VERSION_HEADER}") string(REGEX MATCHALL "[0-9]+" FILE_VERSION_COMPONENTS "${FILE_VERSION_LINE}") list(JOIN FILE_VERSION_COMPONENTS "." FILE_VERSION) - install(FILES $ RENAME mscordaccore_${LONG_NAME_HOST_ARCH}_${LONG_NAME_TARGET_ARCH}_${FILE_VERSION}.dll DESTINATION sharedFramework COMPONENT runtime) + install(PROGRAMS $ RENAME mscordaccore_${LONG_NAME_HOST_ARCH}_${LONG_NAME_TARGET_ARCH}_${FILE_VERSION}.dll DESTINATION sharedFramework COMPONENT runtime) + if (NOT FEATURE_CROSSBITNESS) + install(PROGRAMS $ RENAME mscordaccore_${LONG_NAME_HOST_ARCH}_${LONG_NAME_TARGET_ARCH}_${FILE_VERSION}.dll DESTINATION sharedFramework COMPONENT crosscomponents) + endif() endif()