Skip to content
Snippets Groups Projects
Verified Commit 033d1208 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

WIP: pipeline

parent cdaa27ce
No related branches found
No related tags found
No related merge requests found
Pipeline #9510 passed with warnings
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest

#9511

    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 8 additions and 13 deletions
    CMakeLists.txt
    + 8
    − 13
    View file @ 033d1208
    ...@@ -96,11 +96,11 @@ set(PROTO_FILES ...@@ -96,11 +96,11 @@ set(PROTO_FILES
    set(PROTO_PATH ${PROJECT_SOURCE_DIR}/proto/proto) set(PROTO_PATH ${PROJECT_SOURCE_DIR}/proto/proto)
    # Generated sources # Generated sources
    set(hw_hdrs_path "caosdb/info/v1alpha1") set(hw_hdrs_path "info/v1alpha1")
    set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/include/caosdb/info/v1alpha1/main.pb.cc") set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/include/caosdb/${hw_hdrs_path}/main.pb.cc")
    set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/include/${hw_hdrs_path}/main.pb.h") set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/include/caosdb/${hw_hdrs_path}/main.pb.h")
    set(hw_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/include/caosdb/info/v1alpha1/main.grpc.pb.cc") set(hw_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/include/caosdb/${hw_hdrs_path}/main.grpc.pb.cc")
    set(hw_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/include/${hw_hdrs_path}/main.grpc.pb.h") set(hw_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/include/caosdb/${hw_hdrs_path}/main.grpc.pb.h")
    add_custom_command( add_custom_command(
    OUTPUT "${hw_proto_srcs}" "${hw_proto_hdrs}" "${hw_grpc_srcs}" "${hw_grpc_hdrs}" OUTPUT "${hw_proto_srcs}" "${hw_proto_hdrs}" "${hw_grpc_srcs}" "${hw_grpc_hdrs}"
    COMMAND ${_PROTOBUF_PROTOC} COMMAND ${_PROTOBUF_PROTOC}
    ...@@ -141,13 +141,8 @@ ${_PROTOBUF_LIBPROTOBUF}) ...@@ -141,13 +141,8 @@ ${_PROTOBUF_LIBPROTOBUF})
    ############ INSTALLATION ##################### ############ INSTALLATION #####################
    ############################################### ###############################################
    # These variables slightly modify the install location to allow for version set(libcaosdb_INCLUDE_DEST "include/caosdb")
    # specific installations. set(libcaosdb_LIB_DEST "lib")
    if(NOT INSTALL_DIR_NAME)
    set(INSTALL_DIR_NAME "libcaosdb")
    endif()
    set(libcaosdb_INCLUDE_DEST "include/${INSTALL_DIR_NAME}")
    set(libcaosdb_LIB_DEST "lib/${INSTALL_DIR_NAME}")
    # generator expressions are needed for the include directories, since # generator expressions are needed for the include directories, since
    ...@@ -174,7 +169,7 @@ target_include_directories(caosdb PUBLIC ...@@ -174,7 +169,7 @@ target_include_directories(caosdb PUBLIC
    ) )
    set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/libcaosdb/") set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/.local/")
    # Install libcaosdb in CMAKE_INSTALL_PREFIX (defaults to /usr/local on linux). # Install libcaosdb in CMAKE_INSTALL_PREFIX (defaults to /usr/local on linux).
    # To change the install location, run # To change the install location, run
    # cmake -DCMAKE_INSTALL_PREFIX=<desired-install-path> .. # cmake -DCMAKE_INSTALL_PREFIX=<desired-install-path> ..
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment