From ea6c05a46a14cb7396188779a8a947e2d34a3687 Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Fri, 16 Aug 2024 16:39:28 +0000 Subject: [PATCH] Windows: Install libraries to CMAKE_INSTALL_LIBDIR --- Source/Windows/ARM64EC/CMakeLists.txt | 4 +++- Source/Windows/WOW64/CMakeLists.txt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Windows/ARM64EC/CMakeLists.txt b/Source/Windows/ARM64EC/CMakeLists.txt index db63d63aa..4312bef96 100644 --- a/Source/Windows/ARM64EC/CMakeLists.txt +++ b/Source/Windows/ARM64EC/CMakeLists.txt @@ -1,3 +1,5 @@ +include(GNUInstallDirs) + add_library(arm64ecfex SHARED Module.cpp Module.S @@ -25,5 +27,5 @@ target_link_libraries(arm64ecfex target_link_options(arm64ecfex PRIVATE -static -nostdlib -nostartfiles -nodefaultlibs -lc++ -lc++abi -lunwind -lclang_rt.builtins-arm64ec) install(TARGETS arm64ecfex RUNTIME - DESTINATION lib + DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime) diff --git a/Source/Windows/WOW64/CMakeLists.txt b/Source/Windows/WOW64/CMakeLists.txt index f5626a9ec..29f3b2327 100644 --- a/Source/Windows/WOW64/CMakeLists.txt +++ b/Source/Windows/WOW64/CMakeLists.txt @@ -1,3 +1,5 @@ +include(GNUInstallDirs) + add_library(wow64fex SHARED Module.cpp libwow64fex.def @@ -24,5 +26,5 @@ target_link_libraries(wow64fex target_link_options(wow64fex PRIVATE -static -nostdlib -nostartfiles -nodefaultlibs -lc++ -lc++abi -lunwind -lclang_rt.builtins-aarch64) install(TARGETS wow64fex RUNTIME - DESTINATION lib + DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime)