diff --git a/CMakeLists.txt b/CMakeLists.txt index 24bef4edec50e81a2ca51cac3d32ec435366cfcc..766d82ae73187262ea32df882e68d16aabd8fad5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -# set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) +set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) IF (WIN32) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) @@ -166,24 +166,24 @@ find_package(GTest) if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") add_library(caosdb_grpc SHARED ${GRPC_GENERATED}) add_library(caosdb SHARED ${libcaosdb_INCL} ${libcaosdb_SRC}) - target_link_libraries(caosdb caosdb_grpc + target_link_libraries(caosdb caosdb_grpc grpc::grpc protobuf::protobuf boost::boost gtest::gtest) - set(LIBCAOSDB caosdb caosdb_grpc) + set(LIBCAOSDB caosdb caosdb_grpc) - target_include_directories(caosdb_grpc PUBLIC + target_include_directories(caosdb_grpc PUBLIC $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include> - $<INSTALL_INTERFACE:include> - ) - target_include_directories(caosdb_grpc SYSTEM PUBLIC + ) + target_include_directories(caosdb_grpc SYSTEM PUBLIC ${CONAN_INCLUDE_DIRS} - ) + ) else() - add_library(caosdb - SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED}) - set(LIBCAOSDB caosdb) + add_library(caosdb + SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED}) + set(LIBCAOSDB caosdb) endif() + target_link_libraries(caosdb grpc::grpc protobuf::protobuf boost::boost gtest::gtest stdc++fs