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

Merge renaming into CMakeLists.txt adaptations for Windows

parent 0bc5c515
Branches
Tags
2 merge requests!61Release 0.3.0,!54Resolve "Windows: Linker errors with protobuf-generated code"
......@@ -171,9 +171,9 @@ target_link_libraries(caosdb_grpc
# liblinkahead
# ---------
add_library(caosdb SHARED
${libcaosdb_INCL} ${libcaosdb_SRC})
target_link_libraries(caosdb PUBLIC
add_library(linkahead SHARED
${liblinkahead_INCL} ${liblinkahead_SRC})
target_link_libraries(linkahead PUBLIC
caosdb_grpc gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
)
set(liblinkahead linkahead)
......@@ -187,9 +187,9 @@ target_include_directories(linkahead PUBLIC
# libclinkahead
# ----------
add_library(ccaosdb SHARED src/ccaosdb.cpp)
target_link_libraries(ccaosdb PUBLIC
caosdb caosdb_grpc gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
add_library(clinkahead SHARED src/clinkahead.cpp)
target_link_libraries(clinkahead PUBLIC
linkahead caosdb_grpc gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
)
target_include_directories(clinkahead PUBLIC
$<BUILD_INTERFACE:${liblinkahead_SOURCE_DIR}/include>
......@@ -197,7 +197,6 @@ target_include_directories(clinkahead PUBLIC
$<INSTALL_INTERFACE:include>
)
#set_target_properties(ccaosdb PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}/caosdb.dir/${CMAKE_BUILD_TYPE}/exports.def")
# clinkaheadcli
# ----------
......@@ -207,8 +206,8 @@ target_include_directories(clinkaheadcli PUBLIC
$<BUILD_INTERFACE:${liblinkahead_BINARY_DIR}/include>
$<INSTALL_INTERFACE:include>
)
target_link_libraries(ccaosdbcli PRIVATE
caosdb_grpc ccaosdb
target_link_libraries(clinkaheadcli PRIVATE
caosdb_grpc clinkahead
gRPC::grpc protobuf::libprotobuf ${Boost_LIBRARIES}
)
......@@ -220,8 +219,8 @@ target_include_directories(cxxlinkaheadcli PUBLIC
$<BUILD_INTERFACE:${liblinkahead_BINARY_DIR}/include>
$<INSTALL_INTERFACE:include>
)
target_link_libraries(cxxcaosdbcli PRIVATE
caosdb caosdb_grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
target_link_libraries(cxxlinkaheadcli PRIVATE
linkahead caosdb_grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
)
......@@ -363,7 +362,7 @@ set(liblinkahead_LIB_DEST "lib")
set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/.local/")
install(
# targets to install
TARGETS ${LIBCAOSDB} ccaosdb caosdb_grpc
TARGETS linkahead clinkahead caosdb_grpc
# name of the CMake "export group" containing the targets we want to install
EXPORT linkaheadTargets
# Dynamic, static library and include destination locations after running
......
......@@ -62,10 +62,10 @@ math(EXPR len_test_cases "${len_test_cases} - 1")
foreach (i RANGE "${len_test_cases}")
list(GET test_cases ${i} test_case_name)
add_executable(${test_case_name} ${test_case_name}.cpp)
set(libcaosdb_TEST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/${test_case_name}.cpp
${libcaosdb_TEST_SRC}")
set(liblinkahead_TEST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/${test_case_name}.cpp
${liblinkahead_TEST_SRC}")
target_link_libraries(${test_case_name}
PRIVATE GTest::gtest_main caosdb ccaosdb gtest::gtest caosdb_grpc)
PRIVATE GTest::gtest_main linkahead clinkahead gtest::gtest caosdb_grpc)
target_include_directories(${test_case_name}
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_BINARY_DIR})
set_target_properties(${test_case_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment