diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 7a0ad4ef03c2985cf1679f394b35f6db801e6a5c..16eda496b1fe3b04f6f6c0701330727c7cd89c89 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 d4cd7095e1f9d9ccf51c3e92688010640fc13290..cfa5191cec85aa115cd3b575e87658a5fa848475 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 f2921f40e46a2470efc658aceb39caf6548ec0c4..778005d965f990a71a4a4431c17348d6c0479bc7 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)