diff --git a/CMakeLists.txt b/CMakeLists.txt index 6421c173afc6dbe7fc5cf4dae7755148befae3b0..b22ebd0a07935614be5d1e0c543e49220972ecb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,8 @@ endif() if(BUILD_WITH_GDB_DRIVER_MDBX) add_subdirectory(3rdparty/libmdbx) endif() +if(UNIX) +endif() include (cellframe-sdk/cmake/OS_Detection.cmake) add_subdirectory(cellframe-sdk) @@ -127,7 +129,10 @@ endif() if(UNIX AND NOT WIN32) set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS "-D_GNU_SOURCE") - set(NODE_LIBRARIES cellframe-sdk ) + + # the `pkg_check_modules` function is created with this call + + set(NODE_LIBRARIES cellframe-sdk ${JSONC_LIBRARIES} ) set(NODE_CLI_LIBRARIES m dap_chain_net dap_cuttdb dap_app_cli) @@ -161,6 +166,8 @@ endif() target_include_directories(${PROJECT_NAME} INTERFACE .) + + if(NOT ANDROID) target_include_directories(${NODE_CLI_TARGET} INTERFACE .) target_include_directories(${NODE_TOOL_TARGET} INTERFACE .) diff --git a/cellframe-sdk b/cellframe-sdk index bc03a297a2bf539de3fe95e5fbcef89af2e5ca6e..66e60c32c0dd17b5e8c6db35f18b353e99556da0 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit bc03a297a2bf539de3fe95e5fbcef89af2e5ca6e +Subproject commit 66e60c32c0dd17b5e8c6db35f18b353e99556da0 diff --git a/cmake/OS_Detection.cmake b/cmake/OS_Detection.cmake index fe97e43b0201aa877fbebf8a1527089e54b6523f..fa5457b717fb4f32c68d5df248b4113a322c9860 100644 --- a/cmake/OS_Detection.cmake +++ b/cmake/OS_Detection.cmake @@ -69,11 +69,11 @@ if(UNIX) endif() if (BSD) if(DAP_DEBUG) - set(_CCOPT "-DDAP_DEBUG -Wall -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-function -Wno-implicit-fallthrough -Wno-unused-variable -Wno-unused-parameter -pg -g3 -ggdb -fno-eliminate-unused-debug-symbols -fno-strict-aliasing") + set(_CCOPT "-I/usr/local/include -DDAP_DEBUG -Wall -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-function -Wno-implicit-fallthrough -Wno-unused-variable -Wno-unused-parameter -pg -g3 -ggdb -fno-eliminate-unused-debug-symbols -fno-strict-aliasing") set(_LOPT "-pg") SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg") else() - set(_CCOPT "-Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-function -Wno-implicit-fallthrough -Wno-unused-variable -Wno-unused-parameter -O3 -fPIC -fno-strict-aliasing -fno-ident -ffast-math -ftree-vectorize -fno-asynchronous-unwind-tables -ffunction-sections -std=gnu11") + set(_CCOPT "-I/usr/local/include -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-function -Wno-implicit-fallthrough -Wno-unused-variable -Wno-unused-parameter -O3 -fPIC -fno-strict-aliasing -fno-ident -ffast-math -ftree-vectorize -fno-asynchronous-unwind-tables -ffunction-sections -std=gnu11") endif() endif()