CI: actually run tests

michaelsippel · Jun 29, 2022 · 243b2d6 · 243b2d6
1 parent 4f8a456
commit 243b2d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -39,10 +39,11 @@ jobs:
           -DCMAKE_BUILD_TYPE=Debug             \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           -DCMAKE_VERBOSE_MAKEFILE=ON          \
+          -DBUILD_TESTING=ON                   \
           -DredGrapes_BUILD_EXAMPLES=ON
 
         cmake --build build -j 2
 
     - name: test RedGrapes
       run: |
-        ctest --test-dir build --output-on-failure
+        ctest --test-dir build/test --output-on-failure
diff --git a/redGrapesConfig.cmake b/redGrapesConfig.cmake
@@ -9,6 +9,7 @@ find_package(Boost 1.62.0 REQUIRED COMPONENTS context)
 find_package(fmt REQUIRED)
 find_package(spdlog REQUIRED)
 
+if( NOT TARGET redGrapes )
 add_library(redGrapes
   ${CMAKE_CURRENT_LIST_DIR}/redGrapes/resource/resource.cpp
   ${CMAKE_CURRENT_LIST_DIR}/redGrapes/dispatch/thread/execute.cpp
@@ -19,6 +20,7 @@ add_library(redGrapes
   ${CMAKE_CURRENT_LIST_DIR}/redGrapes/task/task_space.cpp
   ${CMAKE_CURRENT_LIST_DIR}/redGrapes/redGrapes.cpp
 )
+endif()
 
 target_compile_features(redGrapes PUBLIC
     cxx_std_14