From 033d1208adda564ced4420ca46bc57ed095f651f Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 30 Jun 2021 11:08:14 +0200
Subject: [PATCH] WIP: pipeline
---
CMakeLists.txt | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1da9e3a..38600ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,11 +96,11 @@ set(PROTO_FILES
set(PROTO_PATH ${PROJECT_SOURCE_DIR}/proto/proto)
# Generated sources
-set(hw_hdrs_path "caosdb/info/v1alpha1")
-set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/include/caosdb/info/v1alpha1/main.pb.cc")
-set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/include/${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_hdrs "${CMAKE_CURRENT_BINARY_DIR}/include/${hw_hdrs_path}/main.grpc.pb.h")
+set(hw_hdrs_path "info/v1alpha1")
+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/caosdb/${hw_hdrs_path}/main.pb.h")
+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/caosdb/${hw_hdrs_path}/main.grpc.pb.h")
add_custom_command(
OUTPUT "${hw_proto_srcs}" "${hw_proto_hdrs}" "${hw_grpc_srcs}" "${hw_grpc_hdrs}"
COMMAND ${_PROTOBUF_PROTOC}
@@ -141,13 +141,8 @@ ${_PROTOBUF_LIBPROTOBUF})
############ INSTALLATION #####################
###############################################
-# These variables slightly modify the install location to allow for version
-# specific installations.
-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}")
+set(libcaosdb_INCLUDE_DEST "include/caosdb")
+set(libcaosdb_LIB_DEST "lib")
# generator expressions are needed for the include directories, since
@@ -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).
# To change the install location, run
# cmake -DCMAKE_INSTALL_PREFIX=<desired-install-path> ..
--
GitLab