From 519ea689e5b05aa5148ceb6dab2b85eb345bd0ee Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 28 Jun 2021 11:47:27 +0200
Subject: [PATCH] WIP: pipeline - remove custom install prefix
---
.docker/Dockerfile | 4 ++--
.gitlab-ci.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index e7a17cb..5448f51 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -9,7 +9,7 @@ RUN mkdir build
WORKDIR /libcaosdb/build
RUN cmake -D INSTALL_DIR_NAME=libcaosdb ..
RUN cmake --build .
-RUN cmake --install . --prefix /usr/local/
+RUN cmake --install .
COPY . /caosdb-cppinttest
WORKDIR /caosdb-cppinttest
@@ -21,7 +21,7 @@ RUN apt-get install -y openjdk-11-jdk-headless
# build and run tests
CMD mkdir build && \
cd build && \
- cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb .. && \
+ cmake .. && \
cmake --build . && \
/wait-for-it.sh caosdb-server:10443 -t 500 -- \
ctest
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c10280..63263bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -114,7 +114,7 @@ build-test:
- echo $PWD
- mkdir build
- cd build
- - cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb ..
+ - cmake ..
- cmake --build .
--
GitLab