Fix parallel build (hopefully) and boost linking in depends system

blur-network · Nov 26, 2019 · cef3176 · cef3176
1 parent 16dae5f
commit cef3176
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+*/version.h
+
 .DS_Store
 /doc
 /build

diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
@@ -1,6 +1,6 @@
 # Set the system name, either Darwin, Linux, or Windows
 SET(CMAKE_SYSTEM_NAME @depends@)
-SET(CMAKE_BUILD_TYPE release)
+SET(CMAKE_BUILD_TYPE Release)
 
 SET(STATIC true)
 SET(UNBOUND_STATIC true)
@@ -18,17 +18,11 @@ SET(LIBUNWIND_INCLUDE_DIR @prefix@/include)
 SET(LIBUNWIND_LIBRARIES @prefix@/lib/libunwind.a)
 SET(LIBUNWIND_LIBRARY_DIRS @prefix@/lib)
 
-SET(LIBUSB-1.0_LIBRARY @prefix@/lib/libusb-1.0.a)
-SET(LIBUDEV_LIBRARY @prefix@/lib/libudev.a)
-
-SET(ZMQ_INCLUDE_PATH @prefix@/include)
-SET(ZMQ_LIB @prefix@/lib/libzmq.a)
-
 SET(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT ON)
 SET(BOOST_IGNORE_SYSTEM_PATH ON)
 SET(BOOST_ROOT @prefix@)
 SET(BOOST_LIBRARYDIR @prefix@/lib)
-SET(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF)
+SET(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT ON)
 SET(BOOST_NO_SYSTEM_PATHS TRUE)
 SET(BOOST_USE_STATIC_LIBS TRUE)
 SET(BOOST_USE_STATIC_RUNTIME TRUE)

diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
@@ -83,7 +83,7 @@ monero_add_executable(daemon
   ${daemon_private_headers}
   ${blocksdat}
   ${BACKWARD_ENABLE})
-add_dependencies(daemon check_git_repository)
+add_dependencies(daemon check_git_repository rpc daemonizer daemon_rpc_server)
 
 add_backward(daemon)
 

diff --git a/src/daemonizer/CMakeLists.txt b/src/daemonizer/CMakeLists.txt
@@ -64,6 +64,7 @@ monero_add_library(daemonizer
   ${daemonizer_sources}
   ${daemonizer_headers}
   ${daemonizer_private_headers})
+add_dependencies(daemonizer daemon_rpc_server cryptonote_core)
 target_link_libraries(daemonizer
   PUBLIC
     common

diff --git a/src/gen_multisig/CMakeLists.txt b/src/gen_multisig/CMakeLists.txt
@@ -31,6 +31,7 @@ set(gen_multisig_sources
 
 monero_add_executable(gen_multisig
   ${gen_multisig_sources})
+add_dependencies(gen_multisig multisig wallet)
 target_link_libraries(gen_multisig
   PRIVATE
     wallet

diff --git a/src/multisig/CMakeLists.txt b/src/multisig/CMakeLists.txt
@@ -42,6 +42,8 @@ monero_add_library(multisig
   ${multisig_headers}
   ${multisig_private_headers})
 
+add_dependencies(multisig wallet)
+
 target_link_libraries(multisig
   PUBLIC
     ringct

diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
@@ -83,7 +83,7 @@ monero_add_executable(wallet_rpc_server
   ${wallet_rpc_sources}
   ${wallet_rpc_headers}
   ${wallet_rpc_private_headers})
-add_dependencies(wallet_rpc_server check_git_repository)
+add_dependencies(wallet_rpc_server check_git_repository wallet)
 
 target_link_libraries(wallet_rpc_server
   PRIVATE