From 0c5b7de55497b32e499121f8be679ea5cf256480 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 15 Dec 2025 11:26:08 -0500 Subject: [PATCH] build: reduce duplication by setting the win32 depends pre and post excludes in src/apps/CMakeLists --- src/apps/CMakeLists.txt | 8 ++++++++ src/apps/deskflow-core/CMakeLists.txt | 8 ++------ src/apps/deskflow-daemon/CMakeLists.txt | 8 ++------ src/apps/deskflow-gui/CMakeLists.txt | 8 ++------ 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt index e3c453d96..bd5102967 100644 --- a/src/apps/CMakeLists.txt +++ b/src/apps/CMakeLists.txt @@ -28,6 +28,14 @@ function(generate_app_man TARGET NAME) endif() endfunction() +set(WIN32_PRE_EXCLUDE_REGEXES + "api-ms-win-.*" + "ext-ms-.*" + "^hvsifiletrust\\.dll$" +) + +set(WIN32_POST_EXCLUDE_REGEXES ".*system32.*") + add_subdirectory(deskflow-core) add_subdirectory(deskflow-daemon) #Only used on windows add_subdirectory(deskflow-gui) diff --git a/src/apps/deskflow-core/CMakeLists.txt b/src/apps/deskflow-core/CMakeLists.txt index f53c04c1a..ed4e0cb9c 100644 --- a/src/apps/deskflow-core/CMakeLists.txt +++ b/src/apps/deskflow-core/CMakeLists.txt @@ -52,12 +52,8 @@ if(BUILD_OSX_BUNDLE) ) elseif (WIN32) install(RUNTIME_DEPENDENCY_SET coreDeps - PRE_EXCLUDE_REGEXES - "api-ms-win-.*" - "ext-ms-.*" - "^hvsifiletrust\\.dll$" - POST_EXCLUDE_REGEXES - ".*system32.*" + PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES} + POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ) else() diff --git a/src/apps/deskflow-daemon/CMakeLists.txt b/src/apps/deskflow-daemon/CMakeLists.txt index 651841485..59a9d7c71 100644 --- a/src/apps/deskflow-daemon/CMakeLists.txt +++ b/src/apps/deskflow-daemon/CMakeLists.txt @@ -33,12 +33,8 @@ if(WIN32) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) install(RUNTIME_DEPENDENCY_SET daemonDeps - PRE_EXCLUDE_REGEXES - "api-ms-win-.*" - "ext-ms-.*" - "^hvsifiletrust\\.dll$" - POST_EXCLUDE_REGEXES - ".*system32.*" + PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES} + POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ) endif() diff --git a/src/apps/deskflow-gui/CMakeLists.txt b/src/apps/deskflow-gui/CMakeLists.txt index 0d94976bb..b2651578c 100644 --- a/src/apps/deskflow-gui/CMakeLists.txt +++ b/src/apps/deskflow-gui/CMakeLists.txt @@ -60,12 +60,8 @@ if(WIN32) set_target_properties(${target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT") install(RUNTIME_DEPENDENCY_SET guiDeps - PRE_EXCLUDE_REGEXES - "api-ms-win-.*" - "ext-ms-.*" - "^hvsifiletrust\\.dll$" - POST_EXCLUDE_REGEXES - ".*system32.*" + PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES} + POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} )