build: Add CMake-based build system (6 of N) #15
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| # Copyright (c) 2023 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| if(CMAKE_HOST_APPLE) | ||
| execute_process( | ||
| COMMAND brew --prefix berkeley-db@4 | ||
| OUTPUT_VARIABLE bdb4_brew_prefix | ||
| ERROR_QUIET | ||
| OUTPUT_STRIP_TRAILING_WHITESPACE | ||
| ) | ||
| endif() | ||
|
|
||
| find_path(BerkeleyDB_INCLUDE_DIR | ||
| NAMES db.h | ||
| HINTS ${bdb4_brew_prefix}/include | ||
| PATH_SUFFIXES 4.8 48 4 db4 5 5.3 db5 | ||
|
There was a problem hiding this comment. Out of curiosity, where did you get these from?
Owner
Author
|
||
| ) | ||
|
|
||
| if(BerkeleyDB_INCLUDE_DIR) | ||
| file( | ||
| STRINGS "${BerkeleyDB_INCLUDE_DIR}/db.h" version_strings | ||
| REGEX ".*DB_VERSION_(MAJOR|MINOR)[ \t]+[0-9]+.*" | ||
| ) | ||
| string(REGEX REPLACE ".*DB_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" BerkeleyDB_VERSION_MAJOR "${version_strings}") | ||
| string(REGEX REPLACE ".*DB_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" BerkeleyDB_VERSION_MINOR "${version_strings}") | ||
| set(BerkeleyDB_VERSION ${BerkeleyDB_VERSION_MAJOR}.${BerkeleyDB_VERSION_MINOR}) | ||
| endif() | ||
|
|
||
| if(MSVC) | ||
| cmake_path(GET BerkeleyDB_INCLUDE_DIR PARENT_PATH BerkeleyDB_IMPORTED_PATH) | ||
| find_library(BerkeleyDB_LIBRARY_DEBUG | ||
| NAMES libdb48 PATHS ${BerkeleyDB_IMPORTED_PATH}/debug/lib | ||
| NO_DEFAULT_PATH | ||
| ) | ||
| find_library(BerkeleyDB_LIBRARY_RELEASE | ||
| NAMES libdb48 PATHS ${BerkeleyDB_IMPORTED_PATH}/lib | ||
| NO_DEFAULT_PATH | ||
| ) | ||
| if(BerkeleyDB_LIBRARY_DEBUG OR BerkeleyDB_LIBRARY_RELEASE) | ||
| set(BerkeleyDB_required BerkeleyDB_IMPORTED_PATH) | ||
| endif() | ||
| else() | ||
| find_library(BerkeleyDB_LIBRARY | ||
| NAMES db_cxx-4.8 libdb48 db4_cxx db_cxx db_cxx-5 | ||
| HINTS ${bdb4_brew_prefix}/lib | ||
| ) | ||
| set(BerkeleyDB_required BerkeleyDB_LIBRARY) | ||
| endif() | ||
|
|
||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args(BerkeleyDB | ||
| REQUIRED_VARS ${BerkeleyDB_required} BerkeleyDB_INCLUDE_DIR | ||
| VERSION_VAR BerkeleyDB_VERSION | ||
| ) | ||
|
|
||
| if(BerkeleyDB_FOUND AND NOT TARGET BerkeleyDB::BerkeleyDB) | ||
| add_library(BerkeleyDB::BerkeleyDB UNKNOWN IMPORTED) | ||
| set_target_properties(BerkeleyDB::BerkeleyDB PROPERTIES | ||
| INTERFACE_INCLUDE_DIRECTORIES "${BerkeleyDB_INCLUDE_DIR}" | ||
| ) | ||
| if(MSVC) | ||
| if(BerkeleyDB_LIBRARY_DEBUG) | ||
| set_property(TARGET BerkeleyDB::BerkeleyDB APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) | ||
| set_target_properties(BerkeleyDB::BerkeleyDB PROPERTIES | ||
| IMPORTED_LOCATION_DEBUG "${BerkeleyDB_LIBRARY_DEBUG}" | ||
| ) | ||
| endif() | ||
| if(BerkeleyDB_LIBRARY_RELEASE) | ||
| set_property(TARGET BerkeleyDB::BerkeleyDB APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) | ||
| set_target_properties(BerkeleyDB::BerkeleyDB PROPERTIES | ||
| IMPORTED_LOCATION_RELEASE "${BerkeleyDB_LIBRARY_RELEASE}" | ||
| ) | ||
| endif() | ||
| else() | ||
| set_target_properties(BerkeleyDB::BerkeleyDB PROPERTIES | ||
| IMPORTED_LOCATION "${BerkeleyDB_LIBRARY}" | ||
| ) | ||
| endif() | ||
| endif() | ||
|
|
||
| mark_as_advanced( | ||
| BerkeleyDB_INCLUDE_DIR | ||
| BerkeleyDB_LIBRARY | ||
| BerkeleyDB_LIBRARY_DEBUG | ||
| BerkeleyDB_LIBRARY_RELEASE | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| # Copyright (c) 2023 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| # Wallet functionality used by bitcoind and bitcoin-wallet executables. | ||
| add_library(bitcoin_wallet STATIC EXCLUDE_FROM_ALL | ||
| coincontrol.cpp | ||
| coinselection.cpp | ||
| context.cpp | ||
| crypter.cpp | ||
| db.cpp | ||
| dump.cpp | ||
| external_signer_scriptpubkeyman.cpp | ||
| feebumper.cpp | ||
| fees.cpp | ||
| interfaces.cpp | ||
| load.cpp | ||
| receive.cpp | ||
| rpc/addresses.cpp | ||
| rpc/backup.cpp | ||
| rpc/coins.cpp | ||
| rpc/encrypt.cpp | ||
| rpc/spend.cpp | ||
| rpc/signmessage.cpp | ||
| rpc/transactions.cpp | ||
| rpc/util.cpp | ||
| rpc/wallet.cpp | ||
| scriptpubkeyman.cpp | ||
| spend.cpp | ||
| transaction.cpp | ||
| wallet.cpp | ||
| walletdb.cpp | ||
| walletutil.cpp | ||
| ) | ||
| target_link_libraries(bitcoin_wallet | ||
| PRIVATE | ||
| bitcoin_common | ||
| univalue | ||
| Boost::headers | ||
| ) | ||
|
|
||
| if(NOT USE_SQLITE AND NOT USE_BDB) | ||
| message(FATAL_ERROR "Wallet functionality requested but no BDB or SQLite support available.") | ||
| endif() | ||
| if(USE_SQLITE) | ||
| target_sources(bitcoin_wallet PRIVATE sqlite.cpp) | ||
| target_link_libraries(bitcoin_wallet PRIVATE PkgConfig::sqlite) | ||
| endif() | ||
| if(USE_BDB) | ||
| target_sources(bitcoin_wallet PRIVATE bdb.cpp salvage.cpp) | ||
| target_link_libraries(bitcoin_wallet PUBLIC BerkeleyDB::BerkeleyDB) | ||
| endif() |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What happens in the case of
CFLAGS=-isystem foo -I bar?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is all about how CMake handles the output of the
pkg-config --cflags-only-I <package>command. All-I some_directoryinstances are handled fine.For example, in a broken combo of CMake 3.16.6 + pkg-config 0.29.2, the value of the
INTERFACE_INCLUDE_DIRECTORIESproperty of the importedPkgConfig::libzmqtarget is a list as follows:Compare to:
Therefore, to fix the bug, it is enough to just filter out "-isystem" from the
INTERFACE_INCLUDE_DIRECTORIESlist.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add a note explaining what's happening here and what it's working around please? That's not clear to me from the code alone.