diff options
| author | tobtoht <tob@featherwallet.org> | 2025-08-29 18:26:32 +0000 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2025-08-29 18:26:32 +0000 |
| commit | 28c698375c8c0bd0ff1295cc5145c13064919e02 (patch) | |
| tree | 6d4ad545040f788a2e613d8949759349615cef82 | |
| parent | c89f8eca9155473105519c37e706753214534e2a (diff) | |
| parent | cabbbaf1729bc37d0a4b5cc33b0a9448844f60db (diff) | |
| download | monzero-gui-28c698375c8c0bd0ff1295cc5145c13064919e02.tar.gz monzero-gui-28c698375c8c0bd0ff1295cc5145c13064919e02.tar.xz monzero-gui-28c698375c8c0bd0ff1295cc5145c13064919e02.zip | |
Merge pull request #4492
cabbbaf cmake: update macOS deploy for newer boost (selsta)
| -rw-r--r-- | cmake/Deploy.cmake | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/cmake/Deploy.cmake b/cmake/Deploy.cmake index 4789d642..e0db882d 100644 --- a/cmake/Deploy.cmake +++ b/cmake/Deploy.cmake @@ -26,16 +26,19 @@ if(APPLE OR (WIN32 AND NOT STATIC)) ) endif() - # libbost_filesyste-mt.dylib has a dependency on libboost_atomic-mt.dylib, maydeployqt does not copy it by itself - find_package(Boost COMPONENTS atomic) - get_target_property(BOOST_ATOMIC_LIB_PATH Boost::atomic LOCATION) - if(EXISTS ${BOOST_ATOMIC_LIB_PATH}) - add_custom_command(TARGET deploy - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${BOOST_ATOMIC_LIB_PATH}" "$<TARGET_FILE_DIR:monero-wallet-gui>/../Frameworks/" - COMMENT "Copying libboost_atomic-mt.dylib" - ) - endif() + # Copy Boost dylibs that macdeployqt doesn't pick up + find_package(Boost QUIET COMPONENTS atomic container date_time) + set(_boost_extras Boost::atomic Boost::container Boost::date_time) + foreach(_tgt IN LISTS _boost_extras) + if(TARGET ${_tgt}) + add_custom_command(TARGET deploy POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + "$<TARGET_FILE:${_tgt}>" + "$<TARGET_FILE_DIR:monero-wallet-gui>/../Frameworks/" + COMMENT "Copying $<TARGET_FILE_NAME:${_tgt}>" + ) + endif() + endforeach() # Apple Silicon requires all binaries to be codesigned find_program(CODESIGN_EXECUTABLE NAMES codesign) |