Page MenuHomePhabricator

[cmake] Properly include public BerkeleyDB headers with wallet library
ClosedPublic

Authored by schancel on May 1 2018, 16:44.

Details

Summary

Fixes the following compilation issue on MacOS X:

FAILED: src/CMakeFiles/server.dir/init.cpp.o
ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++  -DHAVE_CONFIG_H -DLEVELDB_PLATFORM_POSIX -DOS_MACOSX -I../src/leveldb/helpers/memenv -isystem /usr/local/include -I../src/. -Isrc -I../src/univalue/include -Isrc/crypto/.. -I../src/secp256k1/include -I../src/leveldb/include -Isrc/leveldb/include -Wall -Wextra -Wformat -Wvla -Wformat-security -Wcast-align -Wunused-parameter -Wno-unused-parameter -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -fvisibility=hidden   -std=gnu++11 -MD -MT src/CMakeFiles/server.dir/init.cpp.o -MF src/CMakeFiles/server.dir/init.cpp.o.d -o src/CMakeFiles/server.dir/init.cpp.o -c ../src/init.cpp
In file included from ../src/init.cpp:46:
In file included from ../src/./wallet/wallet.h:19:
In file included from ../src/./wallet/walletdb.h:14:
../src/./wallet/db.h:21:10: fatal error: 'db_cxx.h' file not found
#include <db_cxx.h>
         ^~~~~~~~~~
1 error generated.
Test Plan

Run cmake

Diff Detail

Repository
rABC Bitcoin ABC
Branch
osx-cmake-wallet
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 2427
Build 2983: Bitcoin ABC Buildbot (legacy)
Build 2982: arc lint + arc unit

Event Timeline

deadalnix added a subscriber: deadalnix.
deadalnix added inline comments.
src/wallet/CMakeLists.txt
25

Not sure why this needs moving, now it looks like it is part of linking in the even library.

This revision is now accepted and ready to land.May 1 2018, 17:47
This revision was automatically updated to reflect the committed changes.