diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ba3373e85b84a7d70baecf34f84e99510e13e26..c2e805e3ced57fafd25266c347da6a629b4340f1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.1) project (dap_chain_global_db C) file(GLOB DAP_CHAIN_GLOBAL_DB_SRC *.c) @@ -6,8 +6,6 @@ file(GLOB DAP_CHAIN_GLOBAL_DB_HDR *.h) if(WIN32) include_directories(../libdap/src/win32/) - include_directories(../3rdparty/libmemcached/) - include_directories(../3rdparty/libmemcached/win32/) include_directories(../3rdparty/wepoll/include/) include_directories(../3rdparty/uthash/src/) include_directories(../3rdparty/libjson-c/) @@ -24,7 +22,12 @@ if(WIN32) target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_chain_crypto dap_cuttdb) endif() if(UNIX) - target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_chain_crypto ldb talloc tevent sqlite3 dap_cuttdb) + target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_chain_crypto sqlite3 dap_cuttdb) + + if(NOT ANDROID) + target_link_libraries(${PROJECT_NAME} ldb talloc tevent) + endif() + endif() target_include_directories(dap_chain_global_db INTERFACE .) diff --git a/libdap-cuttdb/CMakeLists.txt b/libdap-cuttdb/CMakeLists.txt old mode 100644 new mode 100755 index fc9ec13b0b81b04c11bc657547b6f665b17478cf..50812739634e5c846bdb91a8679c809e8b6365b0 --- a/libdap-cuttdb/CMakeLists.txt +++ b/libdap-cuttdb/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.1) project(dap_cuttdb C) add_definitions ("-D_GNU_SOURCE") -set(CMAKE_C_FLAGS "-std=gnu11 -Wall -Wextra -fPIC") +set(CMAKE_C_FLAGS " -Wall -Wextra -fPIC") file(GLOB cuttdb_src src/*.c) file(GLOB cuttdb_h src/*.h) @@ -22,7 +22,7 @@ list(FILTER cuttdb_h EXCLUDE REGEX "test_mt.") if(UNIX) list(FILTER cuttdb_src EXCLUDE REGEX "mman.") - list(FILTER cuttdb_h EXCLUDE REGEX "mman.") + list(FILTER cuttdb_h EXCLUDE REGEX "mman.") endif() add_library(${PROJECT_NAME} STATIC ${cuttdb_src} ${cuttdb_h}) @@ -31,6 +31,6 @@ set_target_properties(${PROJECT_NAME} PROPERTIES COMPILER_LANGUAGE C) set_target_properties(dap_cuttdb PROPERTIES LINKER_LANGUAGE C) -target_link_libraries(${PROJECT_NAME} -lpthread) +target_link_libraries(${PROJECT_NAME}) target_include_directories(${PROJECT_NAME} INTERFACE src)