diff --git a/CMakeLists.txt b/CMakeLists.txt index 128da4b..7e99afc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ project(tritoncommon LANGUAGES C CXX) # C++ standard # set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") - +set(CMAKE_BUILD_TYPE Release) # # Options # @@ -46,7 +46,8 @@ option(TRITON_COMMON_ENABLE_JSON "Build json-related libs" ON) if(TRITON_COMMON_ENABLE_JSON) find_package(RapidJSON CONFIG REQUIRED) - message(STATUS "RapidJSON found. Headers: ${RAPIDJSON_INCLUDE_DIRS}") + message(STATUS "RapidJSON found. Headers: ${RapidJSON_INCLUDE_DIRS}") + message(STATUS "RapidJSON version: ${RapidJSON_DIR}") endif() set(THREADS_PREFER_PTHREAD_FLAG TRUE) @@ -103,9 +104,9 @@ if(TRITON_COMMON_ENABLE_JSON) triton-common-json INTERFACE $ - $ + $ $ - $ + $ ) endif() @@ -140,7 +141,6 @@ if(${TRITON_COMMON_ENABLE_PROTOBUF} OR ${TRITON_COMMON_ENABLE_GRPC}) $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src - ${Protobuf_INCLUDE_DIRS} ) target_link_libraries( diff --git a/conanfile.txt b/conanfile.txt new file mode 100644 index 0000000..7fc31ea --- /dev/null +++ b/conanfile.txt @@ -0,0 +1,17 @@ +[requires] +abseil/20230802.1 +c-ares/1.34.5 +grpc/1.54.3 +openssl/3.6.0 +protobuf/3.21.12 +rapidjson/1.1.0 +re2/20230301 +zlib/1.3.1 + + +[generators] +CMakeDeps +CMakeToolchain + +[layout] +cmake_layout diff --git a/protobuf/CMakeLists.txt b/protobuf/CMakeLists.txt index 3b70113..cedfae0 100644 --- a/protobuf/CMakeLists.txt +++ b/protobuf/CMakeLists.txt @@ -29,7 +29,8 @@ cmake_minimum_required (VERSION 3.31.8) set(protobuf_MODULE_COMPATIBLE TRUE CACHE BOOL "protobuf_MODULE_COMPATIBLE" FORCE) find_package(Protobuf CONFIG REQUIRED) message(STATUS "Using protobuf ${Protobuf_VERSION}") -include_directories(${Protobuf_INCLUDE_DIRS}) +message(STATUS "Protobuf includes: ${protobuf_INCLUDE_DIRS}") +include_directories(${protobuf_INCLUDE_DIRS}) if(${TRITON_COMMON_ENABLE_GRPC}) find_package(gRPC CONFIG REQUIRED) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4c98094..1b20092 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -66,7 +66,7 @@ target_include_directories( $ $ PRIVATE - ${RAPIDJSON_INCLUDE_DIRS} + ${RapidJSON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/src/test/triton_json/CMakeLists.txt b/src/test/triton_json/CMakeLists.txt index 4b112d6..a1919b2 100644 --- a/src/test/triton_json/CMakeLists.txt +++ b/src/test/triton_json/CMakeLists.txt @@ -31,12 +31,15 @@ target_link_libraries( GTest::gtest GTest::gtest_main) +message(STATUS "CMAKE_TOOLCHAIN_FILE: ${CMAKE_TOOLCHAIN_FILE}") +find_package(RapidJSON CONFIG REQUIRED) +message(STATUS "RapidJSON found. Headers: ${rapidjson_INCLUDE_DIRS}") target_include_directories( triton-json-test PUBLIC $ $ - $ + $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} )