Skip to content

Commit

Permalink
Merge #330: cmake: Force build-time dependencies for deploy target …
Browse files Browse the repository at this point in the history
…for macOS

af0d59f [FIXUP] Force build-time dependencies for `deploy` target (Hennadii Stepanov)

Pull request description:

  This PR addresses bitcoin#30454 (comment):
  > Is CMake meant to know about/be able to figure build-time dependencies?

  How to test:
  - when cross-compiling:
  ```
  $ make -C depends HOST=arm64-apple-darwin
  $ cmake -B build --toolchain depends/arm64-apple-darwin/toolchain.cmake
  $ cmake --build build -t deploy
  ```
  - on macOS:
  ```
  % cmake -B build -DBUILD_GUI=ON
  % cmake --build build -t deploy
  ```

Top commit has no ACKs.

Tree-SHA512: 87364d2ebae8c8fea8b86ed2513f25fa2d33816edd2240fc0d3f614f711588c9b065200778c8b49b0dfb88c8ff510c9bb6c8821a397bb695f959223c866e3b86
  • Loading branch information
hebasto committed Aug 16, 2024
2 parents 3c200d5 + af0d59f commit 71384da
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 2 additions & 1 deletion cmake/module/Maintenance.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ function(add_macos_deploy_target)
add_custom_target(deploy
DEPENDS ${PROJECT_BINARY_DIR}/dist/${osx_volname}.zip
)
add_dependencies(deploy deploydir)
endif()
add_dependencies(deploydir bitcoin-qt)
add_dependencies(deploy deploydir)
endif()
endfunction()
1 change: 0 additions & 1 deletion src/qt/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,4 @@ endif()

install(TARGETS test_bitcoin-qt
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT GUI
)

0 comments on commit 71384da

Please sign in to comment.