Skip to content
Snippets Groups Projects
Commit 375b9df3 authored by Joscha Schmiedt's avatar Joscha Schmiedt
Browse files

Remove last bits of Conan from CMakeLists.txt

parent 688fa564
No related branches found
No related tags found
2 merge requests!61Release 0.3.0,!48Fix compilation errors on Windows
......@@ -162,10 +162,8 @@ message(DEBUG "gRPC_INCLUDE_DIRS: ${gRPC_INCLUDE_DIRS}")
# libcaosdb
# ---------
add_library(caosdb SHARED
${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED_SOURCES})
target_link_libraries(caosdb PUBLIC
gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
)
......@@ -180,7 +178,7 @@ target_include_directories(caosdb PUBLIC
# libccaosdb
# ----------
add_library(ccaosdb SHARED src/ccaosdb.cpp ${GRPC_GENERATED})
add_library(ccaosdb SHARED src/ccaosdb.cpp ${GRPC_GENERATED_SOURCES})
target_link_libraries(ccaosdb PUBLIC
caosdb
gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
......@@ -200,8 +198,6 @@ target_include_directories(ccaosdbcli PUBLIC
$<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
$<INSTALL_INTERFACE:include>
)
# target_include_directories(ccaosdbcli SYSTEM PUBLIC
# )
target_link_libraries(ccaosdbcli PRIVATE
gRPC::grpc protobuf::libprotobuf ${Boost_LIBRARIES}
......@@ -216,7 +212,6 @@ target_include_directories(cxxcaosdbcli PUBLIC
$<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
$<INSTALL_INTERFACE:include>
)
target_link_libraries(cxxcaosdbcli PRIVATE
caosdb gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
)
......@@ -345,9 +340,10 @@ endif()
### UNIT TEST
#######################################################
enable_testing()
add_subdirectory(test)
if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
enable_testing()
add_subdirectory(test)
endif()
# ###############################################
# ############ INSTALLATION #####################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment