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

WIP: Remove separation of libs for grpc generated code

This is experimental.
parent 39a840d7
No related branches found
No related tags found
2 merge requests!61Release 0.3.0,!48Fix compilation errors on Windows
Pipeline #54309 passed with warnings
Pipeline: caosdb-julialib

#54316

    Pipeline: CaosDB Octave library

    #54315

      Pipeline: caosdb-cppinttest

      #54311

        ......@@ -163,35 +163,13 @@ message(DEBUG "gRPC_INCLUDE_DIRS: ${gRPC_INCLUDE_DIRS}")
        # libcaosdb
        # ---------
        # In Debug, build separate libraries for grpc-generated code and caosdb
        if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
        add_library(caosdb_grpc SHARED ${GRPC_GENERATED})
        target_link_libraries(caosdb_grpc
        gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
        )
        target_include_directories(caosdb_grpc PUBLIC
        $<BUILD_INTERFACE:${PROJECT_INCLUDE_DIR}>
        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
        $<INSTALL_INTERFACE:include>
        )
        add_library(caosdb SHARED ${libcaosdb_INCL} ${libcaosdb_SRC})
        target_link_libraries(caosdb
        caosdb_grpc gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
        )
        set(LIBCAOSDB caosdb caosdb_grpc)
        else()
        add_library(caosdb
        SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
        target_link_libraries(caosdb
        gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
        )
        set(LIBCAOSDB caosdb)
        endif()
        add_library(caosdb
        SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
        target_link_libraries(caosdb
        gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
        )
        set(LIBCAOSDB caosdb)
        target_include_directories(caosdb PUBLIC
        $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
        ......@@ -248,7 +226,7 @@ target_include_directories(cxxcaosdbcli SYSTEM PUBLIC
        )
        target_link_libraries(cxxcaosdbcli
        ${LIBCAOSDB}
        gRPC::grpc protobuf::libprotobuf ${Boost_LIBRARIES}
        gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
        )
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment