Skip to content

Commit

Permalink
HPCC-33028 Win + CMake > v3.28.3 issue
Browse files Browse the repository at this point in the history
REGEX include / exclude getting ignored when declared _after_ the DESTINATION

Signed-off-by: Gordon Smith <[email protected]>
  • Loading branch information
GordonSmith committed Nov 26, 2024
1 parent 3d64195 commit bc462fb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cmake_modules/commonSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1048,16 +1048,16 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
list(INSERT ARGS 3 ${ARGV1}_deps)
if (WIN32)
install(RUNTIME_DEPENDENCY_SET ${ARGV1}_deps
DESTINATION ${EXEC_DIR}
PRE_EXCLUDE_REGEXES "api-ms-win-.*\.dll"
POST_INCLUDE_REGEXES "^${VCPKG_FILES_DIR}.*"
POST_EXCLUDE_REGEXES ".*"
DESTINATION ${EXEC_DIR}
)
else()
install(RUNTIME_DEPENDENCY_SET ${ARGV1}_deps
DESTINATION ${LIB_DIR}
POST_INCLUDE_REGEXES "^${VCPKG_FILES_DIR}\/vcpkg_installed\/.*"
POST_EXCLUDE_REGEXES ".*"
DESTINATION ${LIB_DIR}
)
endif()
endif()
Expand Down

0 comments on commit bc462fb

Please sign in to comment.