diff --git a/CMakeLists.txt b/CMakeLists.txt index c84e011088a..26dbeaa5d9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,13 @@ set(CMAKE_CXX_EXTENSIONS OFF) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/module) include(ProcessConfigurations) +# Flatten static lib dependencies. +# Without this, if libfoo.a depends on libbar.a, libfoo's objects can't begin +# to be compiled until libbar.a has been created. +if (NOT DEFINED CMAKE_OPTIMIZE_DEPENDENCIES) + set(CMAKE_OPTIMIZE_DEPENDENCIES TRUE) +endif() + #============================= # Configurable options #============================= diff --git a/cmake/minisketch.cmake b/cmake/minisketch.cmake index bb93c804672..7407739ed94 100644 --- a/cmake/minisketch.cmake +++ b/cmake/minisketch.cmake @@ -74,6 +74,9 @@ add_library(minisketch STATIC EXCLUDE_FROM_ALL ${PROJECT_SOURCE_DIR}/src/minisketch/src/fields/generic_8bytes.cpp ) +# Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/24058 +set_target_properties(minisketch PROPERTIES OPTIMIZE_DEPENDENCIES OFF) + target_include_directories(minisketch PUBLIC $ diff --git a/cmake/module/GenerateHeaders.cmake b/cmake/module/GenerateHeaders.cmake index c69007acb68..53b211f245c 100644 --- a/cmake/module/GenerateHeaders.cmake +++ b/cmake/module/GenerateHeaders.cmake @@ -2,12 +2,19 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or https://opensource.org/license/mit/. +if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.27) + set(DEPENDS_EXPLICIT_OPT DEPENDS_EXPLICIT_ONLY) +else() + set(DEPENDS_EXPLICIT_OPT) +endif() + function(generate_header_from_json json_source_relpath) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${json_source_relpath}.h COMMAND ${CMAKE_COMMAND} -DJSON_SOURCE_PATH=${CMAKE_CURRENT_SOURCE_DIR}/${json_source_relpath} -DHEADER_PATH=${CMAKE_CURRENT_BINARY_DIR}/${json_source_relpath}.h -P ${PROJECT_SOURCE_DIR}/cmake/script/GenerateHeaderFromJson.cmake DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${json_source_relpath} ${PROJECT_SOURCE_DIR}/cmake/script/GenerateHeaderFromJson.cmake VERBATIM + ${DEPENDS_EXPLICIT_OPT} ) endfunction() @@ -17,5 +24,6 @@ function(generate_header_from_raw raw_source_relpath raw_namespace) COMMAND ${CMAKE_COMMAND} -DRAW_SOURCE_PATH=${CMAKE_CURRENT_SOURCE_DIR}/${raw_source_relpath} -DHEADER_PATH=${CMAKE_CURRENT_BINARY_DIR}/${raw_source_relpath}.h -DRAW_NAMESPACE=${raw_namespace} -P ${PROJECT_SOURCE_DIR}/cmake/script/GenerateHeaderFromRaw.cmake DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${raw_source_relpath} ${PROJECT_SOURCE_DIR}/cmake/script/GenerateHeaderFromRaw.cmake VERBATIM + ${DEPENDS_EXPLICIT_OPT} ) endfunction() diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 4999dbf13f0..9ca26a9e27b 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -36,6 +36,9 @@ add_library(bitcoin_util STATIC EXCLUDE_FROM_ALL ../sync.cpp ) +# Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/24058 +set_target_properties(bitcoin_util PROPERTIES OPTIMIZE_DEPENDENCIES OFF) + target_link_libraries(bitcoin_util PRIVATE core_interface