diff --git a/CMakeLists.txt b/CMakeLists.txt index fb62b5b27..98ee53386 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,6 +163,7 @@ configure_libs() include(GNUInstallDirs) if (WIN32) set(CMAKE_INSTALL_BINDIR .) + set(CMAKE_INSTALL_LIBDIR .) set(CMAKE_INSTALL_LICENSE_DIR .) set(CMAKE_INSTALL_I18N_DIR translations) elseif(UNIX AND NOT APPLE) diff --git a/deploy/windows/deploy.cmake b/deploy/windows/deploy.cmake index 89d85b1b8..e5ff5a88b 100644 --- a/deploy/windows/deploy.cmake +++ b/deploy/windows/deploy.cmake @@ -6,7 +6,7 @@ set(MY_DIR ${CMAKE_CURRENT_LIST_DIR}) set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) -set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${CMAKE_INSTALL_BINDIR}) +set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${CMAKE_INSTALL_LIBDIR}) include(InstallRequiredSystemLibraries) configure_file(${MY_DIR}/pre-cpack.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pre-cpack.cmake @ONLY) diff --git a/src/apps/deskflow-core/CMakeLists.txt b/src/apps/deskflow-core/CMakeLists.txt index e08b35149..711425954 100644 --- a/src/apps/deskflow-core/CMakeLists.txt +++ b/src/apps/deskflow-core/CMakeLists.txt @@ -58,7 +58,7 @@ elseif (WIN32) "^hvsifiletrust\\.dll$" POST_EXCLUDE_REGEXES ".*system32.*" - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ) else() generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION}") diff --git a/src/apps/deskflow-daemon/CMakeLists.txt b/src/apps/deskflow-daemon/CMakeLists.txt index ce8a751c1..651841485 100644 --- a/src/apps/deskflow-daemon/CMakeLists.txt +++ b/src/apps/deskflow-daemon/CMakeLists.txt @@ -39,6 +39,6 @@ if(WIN32) "^hvsifiletrust\\.dll$" POST_EXCLUDE_REGEXES ".*system32.*" - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ) endif() diff --git a/src/apps/deskflow-gui/CMakeLists.txt b/src/apps/deskflow-gui/CMakeLists.txt index 3b11ee2ea..c9a5cbcf4 100644 --- a/src/apps/deskflow-gui/CMakeLists.txt +++ b/src/apps/deskflow-gui/CMakeLists.txt @@ -66,7 +66,7 @@ if(WIN32) "^hvsifiletrust\\.dll$" POST_EXCLUDE_REGEXES ".*system32.*" - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set(QT_DEPENDS_DIR ${CMAKE_BINARY_DIR}/qt-depends) @@ -88,7 +88,7 @@ if(WIN32) install( DIRECTORY ${QT_DEPENDS_DIR}/ - DESTINATION ${CMAKE_INSTALL_BINDIR} + DESTINATION ${CMAKE_INSTALL_LIBDIR} PATTERN "dx*.dll" EXCLUDE )