diff --git a/cmake/curl.cmake b/cmake/curl.cmake index b4e47c83..f7f73d08 100644 --- a/cmake/curl.cmake +++ b/cmake/curl.cmake @@ -60,3 +60,5 @@ else() set(CURL_LIBRARIES libcurl${DEBUG_EXTRA2}${CMAKE_STATIC_LIBRARY_SUFFIX}) add_dependencies(curl_project openssl_project) endif() + +add_dependencies(curl_project zlib_project) diff --git a/cmake/libsodium.cmake b/cmake/libsodium.cmake index e4d0b1dc..80ced833 100644 --- a/cmake/libsodium.cmake +++ b/cmake/libsodium.cmake @@ -45,3 +45,5 @@ else() ) set(LIBSODIUM_LIBRARIES libsodium.a) endif() + +add_dependencies(libsodium_project zlib_project) diff --git a/cmake/libuuid.cmake b/cmake/libuuid.cmake index 62585b45..712cfd57 100644 --- a/cmake/libuuid.cmake +++ b/cmake/libuuid.cmake @@ -14,4 +14,7 @@ if (LINUX) INSTALL_COMMAND make install ) set(LIBUUID_LIBRARIES libuuid.a) + + add_dependencies(libuuid_project zlib_project) endif() + diff --git a/cmake/openssl.cmake b/cmake/openssl.cmake index d048f87e..0fc59862 100644 --- a/cmake/openssl.cmake +++ b/cmake/openssl.cmake @@ -40,4 +40,6 @@ if (MACOS OR LINUX OR MINGW) libcrypto.a ) endif() + + add_dependencies(openssl_project zlib_project) endif() diff --git a/cmake/rocksdb.cmake b/cmake/rocksdb.cmake index 12fac2d9..d6ef6bea 100644 --- a/cmake/rocksdb.cmake +++ b/cmake/rocksdb.cmake @@ -80,3 +80,5 @@ endif() if (MSVC OR LINUX OR MINGW) add_dependencies(rocksdb_project curl_project) endif() + +add_dependencies(rocksdb_project zlib_project) diff --git a/cmake/unittests.cmake b/cmake/unittests.cmake index 8fca2d4e..adf9dcea 100644 --- a/cmake/unittests.cmake +++ b/cmake/unittests.cmake @@ -72,7 +72,11 @@ if (REPERTORY_ENABLE_TESTING) ) add_project_executable(unittests "${UNITTEST_SOURCES}") - add_dependencies(unittests gtest_project) + add_dependencies(unittests + gtest_project + zlib_project + ) + target_compile_definitions(unittests PUBLIC GTEST_LINKED_AS_SHARED_LIBRARY=1 REPERTORY_TESTING