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

Add GRPC_GENERATED back to ccaosdb

On Windows this does not compile without. On Linux, it should not hurt.
parent a3f8f515
No related branches found
No related tags found
2 merge requests!61Release 0.3.0,!48Fix compilation errors on Windows
Pipeline #54374 passed with warnings
Pipeline: caosdb-julialib

#54377

    Pipeline: CaosDB Octave library

    #54376

      Pipeline: caosdb-cppinttest

      #54375

        ...@@ -164,9 +164,9 @@ message(DEBUG "gRPC_INCLUDE_DIRS: ${gRPC_INCLUDE_DIRS}") ...@@ -164,9 +164,9 @@ message(DEBUG "gRPC_INCLUDE_DIRS: ${gRPC_INCLUDE_DIRS}")
        # --------- # ---------
        add_library(caosdb add_library(caosdb SHARED
        SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED}) ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
        target_link_libraries(caosdb target_link_libraries(caosdb PUBLIC
        gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES} gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
        ) )
        set(LIBCAOSDB caosdb) set(LIBCAOSDB caosdb)
        ...@@ -180,10 +180,10 @@ target_include_directories(caosdb PUBLIC ...@@ -180,10 +180,10 @@ target_include_directories(caosdb PUBLIC
        # libccaosdb # libccaosdb
        # ---------- # ----------
        add_library(ccaosdb SHARED src/ccaosdb.cpp) add_library(ccaosdb SHARED src/ccaosdb.cpp ${GRPC_GENERATED})
        target_link_libraries(ccaosdb target_link_libraries(ccaosdb PUBLIC
        caosdb
        gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES} gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
        ${LIBCAOSDB}
        ) )
        target_include_directories(ccaosdb PUBLIC target_include_directories(ccaosdb PUBLIC
        $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
        ...@@ -200,13 +200,11 @@ target_include_directories(ccaosdbcli PUBLIC ...@@ -200,13 +200,11 @@ target_include_directories(ccaosdbcli PUBLIC
        $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
        $<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
        ) )
        target_include_directories(ccaosdbcli SYSTEM PUBLIC # target_include_directories(ccaosdbcli SYSTEM PUBLIC
        ${CONAN_INCLUDE_DIRS} # )
        )
        target_link_libraries(ccaosdbcli target_link_libraries(ccaosdbcli PRIVATE
        gRPC::grpc protobuf::libprotobuf ${Boost_LIBRARIES} gRPC::grpc protobuf::libprotobuf ${Boost_LIBRARIES}
        ${LIBCAOSDB}
        ccaosdb ccaosdb
        ) )
        ...@@ -218,12 +216,9 @@ target_include_directories(cxxcaosdbcli PUBLIC ...@@ -218,12 +216,9 @@ target_include_directories(cxxcaosdbcli PUBLIC
        $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
        $<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
        ) )
        target_include_directories(cxxcaosdbcli SYSTEM PUBLIC
        ${CONAN_INCLUDE_DIRS} target_link_libraries(cxxcaosdbcli PRIVATE
        ) caosdb gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
        target_link_libraries(cxxcaosdbcli
        ${LIBCAOSDB}
        gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
        ) )
        ...@@ -350,10 +345,9 @@ endif() ...@@ -350,10 +345,9 @@ endif()
        ### UNIT TEST ### UNIT TEST
        ####################################################### #######################################################
        if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") enable_testing()
        enable_testing() add_subdirectory(test)
        add_subdirectory(test)
        endif()
        # ############################################### # ###############################################
        # ############ INSTALLATION ##################### # ############ INSTALLATION #####################
        ......
        ...@@ -65,7 +65,7 @@ foreach (i RANGE "${len_test_cases}") ...@@ -65,7 +65,7 @@ foreach (i RANGE "${len_test_cases}")
        set(libcaosdb_TEST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/${test_case_name}.cpp set(libcaosdb_TEST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/${test_case_name}.cpp
        ${libcaosdb_TEST_SRC}") ${libcaosdb_TEST_SRC}")
        target_link_libraries(${test_case_name} target_link_libraries(${test_case_name}
        PRIVATE GTest::gtest_main ${LIBCAOSDB} ccaosdb gtest::gtest) PRIVATE GTest::gtest_main caosdb ccaosdb gtest::gtest)
        target_include_directories(${test_case_name} target_include_directories(${test_case_name}
        PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
        if(_LINTING) if(_LINTING)
        ......
        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