From 0d9105c8224a17454de4e9775ee681e1263c178e Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Sat, 5 Jun 2021 01:47:46 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 2 +-
.gitlab-ci.yml | 3 ++-
test/CMakeLists.txt | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 7a0ad4e..16eda49 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -6,6 +6,6 @@ RUN mkdir build
WORKDIR /libcaosdb/build
RUN cmake ..
RUN cmake --build .
-RUN cmake --install .
+RUN cmake --install . --prefix /usr/local/
CMD /bin/bash
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4cd709..cfa5191 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,7 @@ variables:
TRIGGERED_BY_REPO: CPPINTTEST
TRIGGERED_BY_REF: $CI_COMMIT_REF_NAME
TRIGGERED_BY_HASH: $CI_COMMIT_SHORT_SHA
+ CPPLIB_VERSION: 0.0.1
stages:
- setup
@@ -60,6 +61,6 @@ test:
script:
- mkdir build
- cd build
- - cmake ..
+ - cmake -D CMAKE_PREFIX_PATH=/usr/local/include/libcaosdb-${CPPLIB_VERSION} ..
- cmake --build .
- ctest
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f2921f4..778005d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,11 +23,11 @@ set(test_cases
test_connection
)
-find_package(caosdb PATHS /home/tf/libcaosdb/lib/libcaosdb-0.0.1/ REQUIRED)
+find_package(caosdb REQUIRED)
include(FetchGTest)
# add special cmake functions for gtest
-include(GoogleTest)
+include(GoogleTest REQUIRED)
# loop over all test cases and add them to the test runner
list(LENGTH test_cases len_test_cases)
--
GitLab