Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,12 @@
<ClCompile Include="..\..\..\..\test\memory\utilities.cpp">
<ObjectFileName>$(IntDir)test_memory_utilities.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp" />
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp" />
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp">
<ObjectFileName>$(IntDir)test_mocks_blocks.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp">
<ObjectFileName>$(IntDir)test_mocks_chunk_storage.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\arrayhead.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\hashhead.cpp" />
Expand Down Expand Up @@ -178,7 +182,9 @@
<ClCompile Include="..\..\..\..\test\tables\optional\address.cpp" />
<ClCompile Include="..\..\..\..\test\tables\optional\filter_bk.cpp" />
<ClCompile Include="..\..\..\..\test\tables\optional\filter_tx.cpp" />
<ClCompile Include="..\..\..\..\test\test.cpp" />
<ClCompile Include="..\..\..\..\test\test.cpp">
<ObjectFileName>$(IntDir)test_test.obj</ObjectFileName>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\test\mocks\blocks.hpp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@
<ClCompile Include="..\..\..\..\src\locks\flush_lock.cpp" />
<ClCompile Include="..\..\..\..\src\locks\interprocess_lock.cpp" />
<ClCompile Include="..\..\..\..\src\memory\map.cpp" />
<ClCompile Include="..\..\..\..\src\memory\mman-win32\mman.cpp" />
<ClCompile Include="..\..\..\..\src\memory\mman-win32\mman.cpp">
<ObjectFileName>$(IntDir)src_memory_mman-win32_mman.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\src\memory\utilities.cpp">
<ObjectFileName>$(IntDir)src_memory_utilities.obj</ObjectFileName>
</ClCompile>
Expand Down
12 changes: 5 additions & 7 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -250,15 +250,13 @@ AS_CASE([${with_tests}], [yes],

# Require bitcoin-system of at least version 4.0.0 and output ${bitcoin_system_CPPFLAGS/LIBS/PKG}.
#------------------------------------------------------------------------------
PKG_CHECK_MODULES([bitcoin_system], [libbitcoin-system >= 4.0.0],
[bitcoin_system_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-system >= 4.0.0" 2>/dev/null`"
bitcoin_system_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-system >= 4.0.0" 2>/dev/null`"],
[AC_MSG_ERROR([libbitcoin-system >= 4.0.0 is required but was not found.])])
PKG_CHECK_MODULES([bitcoin_system], [libbitcoin-system >= 4.0.0], [],
[
AC_MSG_ERROR([libbitcoin-system >= 4.0.0 is required but was not found.])
])
AC_SUBST([bitcoin_system_PKG], ['libbitcoin-system >= 4.0.0'])
AC_SUBST([bitcoin_system_CPPFLAGS], [${bitcoin_system_CFLAGS}])
AS_IF([test x${bitcoin_system_INCLUDEDIR} != "x"],
[AC_SUBST([bitcoin_system_ISYS_CPPFLAGS], ["-isystem${bitcoin_system_INCLUDEDIR} ${bitcoin_system_OTHER_CFLAGS}"])],
[AC_SUBST([bitcoin_system_ISYS_CPPFLAGS], [${bitcoin_system_OTHER_CFLAGS}])])
AC_SUBST([bitcoin_system_ISYS_CPPFLAGS], [`echo ${bitcoin_system_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]])
AC_MSG_NOTICE([bitcoin_system_CPPFLAGS : ${bitcoin_system_CPPFLAGS}])
AC_MSG_NOTICE([bitcoin_system_ISYS_CPPFLAGS : ${bitcoin_system_ISYS_CPPFLAGS}])
AC_MSG_NOTICE([bitcoin_system_OTHER_CFLAGS : ${bitcoin_system_OTHER_CFLAGS}])
Expand Down
1 change: 0 additions & 1 deletion libbitcoin-database.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@


# Metadata
#==============================================================================
Name: libbitcoin-database
Expand Down
Loading