diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml index 04b86a7..94321db 100644 --- a/.github/workflows/run-test.yml +++ b/.github/workflows/run-test.yml @@ -17,7 +17,7 @@ jobs: build-and-test: name: Build and execute unit tests - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Install googletest @@ -32,7 +32,9 @@ jobs: uses: actions/checkout@v4 - name: Configure tests - run: GTEST_ROOT=/usr/local cmake -B ./build -S ./test -DCMAKE_BUILD_TYPE=Release + run: > + GTEST_ROOT=/usr/local + cmake -B ./build -S ./test -DCMAKE_BUILD_TYPE=Release - name: Build and execute tests run: cmake --build ./build --target check diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c99b056..1126d84 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,15 +4,18 @@ # # This file is part of FEDEM - https://openfedem.org -cmake_minimum_required ( VERSION 2.8...3.5 ) +cmake_minimum_required ( VERSION 2.8...3.10 ) # Project setup project ( cmake-test CXX ) message ( STATUS "Generating build project for ${PROJECT_SOURCE_DIR}" ) +get_filename_component ( PROJECT_PARENT_DIR "${PROJECT_SOURCE_DIR}" PATH ) find_path ( _MODULES FedemConfig.cmake - PATHS $ENV{CMAKE_MODULES} ../Modules ) + PATHS $ENV{CMAKE_MODULES} + ${PROJECT_PARENT_DIR}/Modules + ) if ( _MODULES ) message ( STATUS "NOTE : Using ${_MODULES}" ) list ( APPEND CMAKE_MODULE_PATH ${_MODULES} )