From 8db5287183350877e1b002603d121b69cffe0964 Mon Sep 17 00:00:00 2001 From: Dmitriy Gerasimov <naeper@demlabs.net> Date: Tue, 4 Jun 2019 14:40:15 +0700 Subject: [PATCH] [*] Submodules updates [*] Fixed check if the submodule is initialized --- .gitmodules | 6 ++++++ CMakeLists.txt | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index acb3f1c..513216f 100755 --- a/.gitmodules +++ b/.gitmodules @@ -2,6 +2,12 @@ path = libdap url = https://github.com/kelvinblockchain/libdap branch = master + +[submodule "libdap-crypto"] + path = libdap-crypto + url = https://github.com/kelvinblockchain/libdap-crypto + branch = master + [submodule "test/libdap-test"] path = test/libdap-test url = https://github.com/kelvinblockchain/libdap-test diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b39c33..223f7fd 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,9 @@ if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON)) if ( NOT ( TARGET dap_core ) ) add_subdirectory(libdap) endif() + if ( NOT ( TARGET dap_crypto ) ) + add_subdirectory(libdap-crypto) + endif() enable_testing() add_subdirectory(test) endif() @@ -22,5 +25,5 @@ file(GLOB CORE_SERVER_HEADERS *.h) add_library(${PROJECT_NAME} STATIC ${CORE_SERVER_SOURCES} ${CORE_SERVER_HEADERS}) -target_link_libraries(${PROJECT_NAME} pthread ev memcached dap_crypto) +target_link_libraries(${PROJECT_NAME} pthread ev memcached dap_core dap_crypto) target_include_directories(${PROJECT_NAME} INTERFACE .) -- GitLab