From 67ad4fe092019dd47e5389f24e60b86bebb2ad50 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 1 Jul 2021 23:15:12 +0200
Subject: [PATCH] WIP: pipeline
---
CMakeLists.txt | 17 ++++++++++++-----
conanfile.py | 2 ++
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f009b4f..5b25980 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,12 +36,12 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
# dependency management with conan
-#include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-#conan_basic_setup()
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()
set(PROJECT_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include")
-option(LINTING ON)
+option(LINTING "clang-tidy and iwye" ON)
if(LINTING)
find_program(iwyu NAMES include-what-you-use iwyu PATHS ${CMAKE_SOURCE_DIR}/tools/include-what-you-use/${iwyu_os}/bin)
if(NOT iwyu)
@@ -79,7 +79,7 @@ set_target_properties(caosdbcli PROPERTIES
CXX_CLANG_TIDY "${_CMAKE_CXX_CLANG_TIDY}"
CXX_INCLUDE_WHAT_YOU_USE "${_CMAKE_CXX_INCLUDE_WHAT_YOU_USE}"
)
-target_link_libraries(caosdbcli caosdb)
+target_link_libraries(caosdbcli caosdb caosdb_info_v1alpha1 ${CONAN_LIBS})
if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
# supress warnings during build of gtest
@@ -142,6 +142,7 @@ target_link_libraries(caosdb_info_v1alpha1
${CONAN_LIBS})
target_include_directories(caosdb_info_v1alpha1 PUBLIC
# headers to include when building from source
+ ${CONAN_INCLUDE_DIRS}
$<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
$<INSTALL_INTERFACE:include>
@@ -149,7 +150,8 @@ target_include_directories(caosdb_info_v1alpha1 PUBLIC
target_link_libraries(caosdb
caosdb_info_v1alpha1
-${CONAN_LIBS})
+${CONAN_LIBS}
+)
###############################################
@@ -183,6 +185,11 @@ target_include_directories(caosdb PUBLIC
$<INSTALL_INTERFACE:include>
)
+target_include_directories(caosdbcli PUBLIC
+ ${libcaosdb_SOURCE_DIR}/include>
+ ${libcaosdb_BINARY_DIR}/include>
+ ${CONAN_INCLUDE_DIRS}
+ )
set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/.local/")
# Install libcaosdb in CMAKE_INSTALL_PREFIX (defaults to /usr/local on linux).
diff --git a/conanfile.py b/conanfile.py
index 21b8b68..dda88a0 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -19,6 +19,8 @@ class LibcaosdbConan(ConanFile):
def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
+ elif self.settings.get_safe("compiler.libcxx") is not None:
+ self.settings.compiler.libcxx = "libstdc++11"
def source(self):
self.run("git clone https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git")
--
GitLab