Skip to content
Snippets Groups Projects
Verified Commit 519ea689 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

WIP: pipeline - remove custom install prefix

parent f8be014b
No related branches found
No related tags found
No related merge requests found
Pipeline #9329 failed
...@@ -9,7 +9,7 @@ RUN mkdir build ...@@ -9,7 +9,7 @@ RUN mkdir build
WORKDIR /libcaosdb/build WORKDIR /libcaosdb/build
RUN cmake -D INSTALL_DIR_NAME=libcaosdb .. RUN cmake -D INSTALL_DIR_NAME=libcaosdb ..
RUN cmake --build . RUN cmake --build .
RUN cmake --install . --prefix /usr/local/ RUN cmake --install .
COPY . /caosdb-cppinttest COPY . /caosdb-cppinttest
WORKDIR /caosdb-cppinttest WORKDIR /caosdb-cppinttest
...@@ -21,7 +21,7 @@ RUN apt-get install -y openjdk-11-jdk-headless ...@@ -21,7 +21,7 @@ RUN apt-get install -y openjdk-11-jdk-headless
# build and run tests # build and run tests
CMD mkdir build && \ CMD mkdir build && \
cd build && \ cd build && \
cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb .. && \ cmake .. && \
cmake --build . && \ cmake --build . && \
/wait-for-it.sh caosdb-server:10443 -t 500 -- \ /wait-for-it.sh caosdb-server:10443 -t 500 -- \
ctest ctest
...@@ -114,7 +114,7 @@ build-test: ...@@ -114,7 +114,7 @@ build-test:
- echo $PWD - echo $PWD
- mkdir build - mkdir build
- cd build - cd build
- cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb .. - cmake ..
- cmake --build . - cmake --build .
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment