[*] Splitted sources by src/ and include/

[*] Fixed unit tests

.gitmodules

@@ -5,7 +5,7 @@
 
 [submodule "libdap-crypto"]
 	path = libdap-crypto
-	url = https://github.com/kelvinblockchain/libdap-crypto
+	url = https://github.com/cellframe/libdap-crypto
 	branch = master
 
 [submodule "test/libdap-test"]

.travis.yml

@@ -6,7 +6,7 @@ notifications:
 
 before_install:
     - git submodule init
-    - git submodule update --recursive
+    - git submodule update
 
 script:
     - mkdir build
@@ -20,5 +20,5 @@ addons:
     sources:
     - ubuntu-toolchain-r-test
     packages:
-    - libev-dev
-
+    - libev-dev 
+    - libmemcached-dev

CMakeLists.txt

 cmake_minimum_required(VERSION 3.0)
-
-if(TARGET dap_core_server)
-    return() # The project has already been built.
-endif()
-
-project (dap_core_server C)
-set(CMAKE_C_STANDARD 11)
-
+project(dap_server_core)
 add_definitions ("-D_GNU_SOURCE")
 
 if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
+    set(SUBMODULES_NO_BUILD 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()
 
-file(GLOB CORE_SERVER_SOURCES *.c)
-file(GLOB CORE_SERVER_HEADERS *.h)
+file(GLOB DAP_SERVER_CORE_SOURCES src/*.c)
+file(GLOB DAP_SERVER_CORE_HEADERS include/*.h)
+
+add_library(${PROJECT_NAME} STATIC ${DAP_SERVER_CORE_HEADERS} ${DAP_SERVER_CORE_SOURCES})
+
+target_link_libraries(${PROJECT_NAME} dap_test dap_core dap_crypto pthread memcached ev)
+target_include_directories(${PROJECT_NAME} PUBLIC include)
+target_include_directories(${PROJECT_NAME} PRIVATE src)
+
 
-add_library(${PROJECT_NAME} STATIC ${CORE_SERVER_SOURCES} ${CORE_SERVER_HEADERS})
+if (${BUILD_DAP_SERVER_CORE_TESTS} MATCHES ON)
+    enable_testing()
+    add_subdirectory(test)
+endif()
 
-target_link_libraries(${PROJECT_NAME} pthread ev memcached dap_core dap_crypto)
-target_include_directories(${PROJECT_NAME} INTERFACE .)

libdap @ 4ab41cdc

-Subproject commit d37b2aa26d2a7cc068529db343a87fd728904d33
+Subproject commit 4ab41cdcaa8087323652cd5fef702876ccc25dab

libdap-crypto @ ff63d762

+Subproject commit ff63d762657f9687173db825705b8bf4b958abee

test/CMakeLists.txt

-if(TARGET core_server_test)
-    return() # The project has already been built.
-endif()
-project(core_server_test)
+project(server_core_test)
+
 
-add_subdirectory(libdap-test)
+if ( NOT ( TARGET dap_test ) )
+    add_subdirectory(libdap-test)
+endif()
 
-file(GLOB SOURCES *.c)
-file(GLOB HEADERS *.h)
+file(GLOB DAP_SERVER_CORE_TEST_SOURCES *.c)
+file(GLOB DAP_SERVER_CORE_TEST_HEADERS *.h)
 
-add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS})
+add_executable(${PROJECT_NAME} ${DAP_SERVER_CORE_TEST_SOURCES} ${DAP_SERVER_CORE_TEST_HEADERS})
 
-target_link_libraries(${PROJECT_NAME} dap_test dap_core_server ev)
+target_link_libraries(${PROJECT_NAME} dap_test dap_core dap_crypto dap_server_core ev)
 
 add_test(
-    NAME core_server_test
-    COMMAND core_server_test
+    NAME server_core_test
+    COMMAND server_core_test
 )

test/main.c

 #include "dap_common.h"
 #include "dap_traffic_track_test.h"
 
-int main(void) {
+int main(int argc, const char * argv[]) {
     // switch off debug info from library
-//    set_log_level(L_CRITICAL);
-//    dap_traffic_track_tests_run();
+    //dap_log_level_set(L_CRITICAL);
+    //dap_traffic_track_tests_run();
     return 0;
 }