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

Re-add CMAKE_MODULE_PATH

parent 14d76b47
No related branches found
No related tags found
2 merge requests!61Release 0.3.0,!49Resolve "EXTERN: Adapt to Conan 2"
Pipeline #51751 failed
This commit is part of merge request !49. Comments created here will be created in the context of that merge request.
...@@ -40,7 +40,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) ...@@ -40,7 +40,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS 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) IF (WIN32)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
...@@ -173,7 +173,6 @@ if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") ...@@ -173,7 +173,6 @@ if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
target_include_directories(caosdb_grpc PUBLIC target_include_directories(caosdb_grpc PUBLIC
$<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
target_include_directories(caosdb_grpc SYSTEM PUBLIC target_include_directories(caosdb_grpc SYSTEM PUBLIC
...@@ -184,6 +183,7 @@ else() ...@@ -184,6 +183,7 @@ else()
SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED}) SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
set(LIBCAOSDB caosdb) set(LIBCAOSDB caosdb)
endif() endif()
target_link_libraries(caosdb target_link_libraries(caosdb
grpc::grpc protobuf::protobuf boost::boost gtest::gtest grpc::grpc protobuf::protobuf boost::boost gtest::gtest
stdc++fs stdc++fs
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment