smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: install runtime depends on windows to CMAKE_INSTALL_LIBDIR, set CMAKE_INSTALL_LIBDIR to . on windows

Browse source
This commit is contained in:
sithlord48 2025-11-08 12:13:00 -05:00 committed by Chris Rizzitello
parent 8e754b2ce2
commit 5bcefbe582
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -163,6 +163,7 @@ configure_libs()
include(GNUInstallDirs) include(GNUInstallDirs)
if (WIN32) if (WIN32)
set(CMAKE_INSTALL_BINDIR .) set(CMAKE_INSTALL_BINDIR .)
set(CMAKE_INSTALL_LIBDIR .)
set(CMAKE_INSTALL_LICENSE_DIR .) set(CMAKE_INSTALL_LICENSE_DIR .)
set(CMAKE_INSTALL_I18N_DIR translations) set(CMAKE_INSTALL_I18N_DIR translations)
elseif(UNIX AND NOT APPLE) elseif(UNIX AND NOT APPLE)

2
deploy/windows/deploy.cmake
View file

@ -6,7 +6,7 @@
set(MY_DIR ${CMAKE_CURRENT_LIST_DIR}) set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) 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) include(InstallRequiredSystemLibraries)
configure_file(${MY_DIR}/pre-cpack.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pre-cpack.cmake @ONLY) configure_file(${MY_DIR}/pre-cpack.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pre-cpack.cmake @ONLY)

2
src/apps/deskflow-core/CMakeLists.txt
View file

@ -58,7 +58,7 @@ elseif (WIN32)
"^hvsifiletrust\\.dll$" "^hvsifiletrust\\.dll$"
POST_EXCLUDE_REGEXES POST_EXCLUDE_REGEXES
".*system32.*" ".*system32.*"
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
else() else()
generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION}") generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION}")

2
src/apps/deskflow-daemon/CMakeLists.txt
View file

@ -39,6 +39,6 @@ if(WIN32)
"^hvsifiletrust\\.dll$" "^hvsifiletrust\\.dll$"
POST_EXCLUDE_REGEXES POST_EXCLUDE_REGEXES
".*system32.*" ".*system32.*"
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
endif() endif()

4
src/apps/deskflow-gui/CMakeLists.txt
View file

@ -66,7 +66,7 @@ if(WIN32)
"^hvsifiletrust\\.dll$" "^hvsifiletrust\\.dll$"
POST_EXCLUDE_REGEXES POST_EXCLUDE_REGEXES
".*system32.*" ".*system32.*"
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
set(QT_DEPENDS_DIR ${CMAKE_BINARY_DIR}/qt-depends) set(QT_DEPENDS_DIR ${CMAKE_BINARY_DIR}/qt-depends)
@ -88,7 +88,7 @@ if(WIN32)
install( install(
DIRECTORY ${QT_DEPENDS_DIR}/ DIRECTORY ${QT_DEPENDS_DIR}/
DESTINATION ${CMAKE_INSTALL_BINDIR} DESTINATION ${CMAKE_INSTALL_LIBDIR}
PATTERN "dx*.dll" EXCLUDE PATTERN "dx*.dll" EXCLUDE
) )