highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-17 21:32:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 45bfd97ec7c9991f41673d79b01277bfd940e64e into 5f4422d68dc3530c353af1f87499de1c864b60ad

Browse Source
This commit is contained in:
Ryan Ofsky 2025-03-17 03:55:03 +01:00 committed by GitHub
commit 8af6d175e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/test/03_test_script.sh
View File

@ -149,7 +149,7 @@ if [ "$RUN_UNIT_TESTS" = "true" ]; then
fi fi
if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
DIR_UNIT_TEST_DATA="${DIR_UNIT_TEST_DATA}" LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" "${BASE_OUTDIR}"/bin/test_bitcoin --catch_system_errors=no -l test_suite DIR_UNIT_TEST_DATA="${DIR_UNIT_TEST_DATA}" LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" "${BASE_OUTDIR}"/libexec/test_bitcoin --catch_system_errors=no -l test_suite
fi fi
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then

9
cmake/module/InstallBinaryComponent.cmake
View File

@ -8,13 +8,18 @@ include(GNUInstallDirs)
function(install_binary_component component) function(install_binary_component component)
cmake_parse_arguments(PARSE_ARGV 1 cmake_parse_arguments(PARSE_ARGV 1
IC # prefix IC # prefix
"HAS_MANPAGE" # options "HAS_MANPAGE;INTERNAL" # options
"" # one_value_keywords "" # one_value_keywords
"" # multi_value_keywords "" # multi_value_keywords
) )
set(target_name ${component}) set(target_name ${component})
if(IC_INTERNAL)
set(runtime_dest ${CMAKE_INSTALL_LIBEXECDIR})
else()
set(runtime_dest ${CMAKE_INSTALL_BINDIR})
endif()
install(TARGETS ${target_name} install(TARGETS ${target_name}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${runtime_dest}
COMPONENT ${component} COMPONENT ${component}
) )
if(INSTALL_MAN AND IC_HAS_MANPAGE) if(INSTALL_MAN AND IC_HAS_MANPAGE)

3
src/CMakeLists.txt
View File

@ -352,7 +352,7 @@ if(WITH_MULTIPROCESS AND BUILD_DAEMON)
bitcoin_ipc bitcoin_ipc
$<TARGET_NAME_IF_EXISTS:bitcoin_wallet> $<TARGET_NAME_IF_EXISTS:bitcoin_wallet>
) )
install_binary_component(bitcoin-node) install_binary_component(bitcoin-node INTERNAL)
endif() endif()
if(WITH_MULTIPROCESS AND BUILD_TESTS) if(WITH_MULTIPROCESS AND BUILD_TESTS)
@ -451,6 +451,7 @@ if(BUILD_UTIL_CHAINSTATE)
core_interface core_interface
bitcoinkernel bitcoinkernel
) )
install_binary_component(bitcoin-chainstate INTERNAL)
endif() endif()

2
src/bench/CMakeLists.txt
View File

@ -82,4 +82,4 @@ add_test(NAME bench_sanity_check_high_priority
COMMAND bench_bitcoin -sanity-check -priority-level=high COMMAND bench_bitcoin -sanity-check -priority-level=high
) )
install_binary_component(bench_bitcoin) install_binary_component(bench_bitcoin INTERNAL)

2
src/qt/CMakeLists.txt
View File

@ -253,7 +253,7 @@ if(WITH_MULTIPROCESS)
bitcoin_ipc bitcoin_ipc
) )
import_plugins(bitcoin-gui) import_plugins(bitcoin-gui)
install_binary_component(bitcoin-gui) install_binary_component(bitcoin-gui INTERNAL)
if(WIN32) if(WIN32)
set_target_properties(bitcoin-gui PROPERTIES WIN32_EXECUTABLE TRUE) set_target_properties(bitcoin-gui PROPERTIES WIN32_EXECUTABLE TRUE)
endif() endif()

2
src/qt/test/CMakeLists.txt
View File

@ -45,4 +45,4 @@ if(WIN32 AND VCPKG_TARGET_TRIPLET)
) )
endif() endif()
install_binary_component(test_bitcoin-qt) install_binary_component(test_bitcoin-qt INTERNAL)

2
src/test/CMakeLists.txt
View File

@ -209,4 +209,4 @@ endfunction()
add_all_test_targets() add_all_test_targets()
install_binary_component(test_bitcoin) install_binary_component(test_bitcoin INTERNAL)