Skip to content

Commit cabbbaf

Browse files
committed
cmake: update macOS deploy for newer boost
1 parent c89f8ec commit cabbbaf

1 file changed

Lines changed: 13 additions & 10 deletions

File tree

cmake/Deploy.cmake

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,19 @@ if(APPLE OR (WIN32 AND NOT STATIC))
2626
)
2727
endif()
2828

29-
# libbost_filesyste-mt.dylib has a dependency on libboost_atomic-mt.dylib, maydeployqt does not copy it by itself
30-
find_package(Boost COMPONENTS atomic)
31-
get_target_property(BOOST_ATOMIC_LIB_PATH Boost::atomic LOCATION)
32-
if(EXISTS ${BOOST_ATOMIC_LIB_PATH})
33-
add_custom_command(TARGET deploy
34-
POST_BUILD
35-
COMMAND ${CMAKE_COMMAND} -E copy "${BOOST_ATOMIC_LIB_PATH}" "$<TARGET_FILE_DIR:monero-wallet-gui>/../Frameworks/"
36-
COMMENT "Copying libboost_atomic-mt.dylib"
37-
)
38-
endif()
29+
# Copy Boost dylibs that macdeployqt doesn't pick up
30+
find_package(Boost QUIET COMPONENTS atomic container date_time)
31+
set(_boost_extras Boost::atomic Boost::container Boost::date_time)
32+
foreach(_tgt IN LISTS _boost_extras)
33+
if(TARGET ${_tgt})
34+
add_custom_command(TARGET deploy POST_BUILD
35+
COMMAND ${CMAKE_COMMAND} -E copy
36+
"$<TARGET_FILE:${_tgt}>"
37+
"$<TARGET_FILE_DIR:monero-wallet-gui>/../Frameworks/"
38+
COMMENT "Copying $<TARGET_FILE_NAME:${_tgt}>"
39+
)
40+
endif()
41+
endforeach()
3942

4043
# Apple Silicon requires all binaries to be codesigned
4144
find_program(CODESIGN_EXECUTABLE NAMES codesign)

0 commit comments

Comments
 (0)