diff --git a/.docker/Dockerfile b/.docker/Dockerfile index e7a17cb1c537b9cfe798516f237c5b61d9d33ff2..5448f514102e1ffcd1b2fd52c903e35e6cadd722 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 4c10280ad0d2eefbd3858fa727678608dff3b586..63263bba90cb14ab8583bb99843c1625fcb4ced5 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 .