Merge pull request #91 from bernedom/building/try-for-systeminstalled…

…-catch

Building/try for systeminstalled catch

.github/workflows/ci.yml

@@ -67,10 +67,14 @@ jobs:
         run: ctest -C Debug
         working-directory: ./build
 
-      - name: program-termination-tests
+      - name: installation-tests
         if: runner.os == 'Linux' || runner.os == 'macOs'
         run: |
           ./test/installation-tests.sh
+
+      - name: program-termination-tests
+        if: runner.os == 'Linux' || runner.os == 'macOs'
+        run: |
           ./test/compilation-tests.sh
 
   version-consistency-check:

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 2.1.1
 
+*   Tests are built without the need for conan if catch2 is found. (using conan is still the preferred way)
 *   Cleaning up obsolete todos and typos
 
 ## 2.1.0

test/CMakeLists.txt

@@ -1,16 +1,12 @@
 cmake_minimum_required(VERSION 3.12)
 
 find_program(CONAN conan)
-if(NOT CONAN)
-  message(WARNING "Conan not found. Skipping tests")
-  return()
-endif()
 
 # if built within conan use the file from local cache
 if(CONAN_EXPORTED)
   include(${PROJECT_BINARY_DIR}/conanbuildinfo.cmake)
   conan_basic_setup(TARGETS)
-else()
+elseif(CONAN)
   # setting up conan to download.cmake automatically, you can also just copy the
   if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/conan.cmake")
     message(
@@ -24,14 +20,20 @@ else()
   include(${CMAKE_CURRENT_BINARY_DIR}/conan.cmake)
   conan_cmake_run(CONANFILE conanfile.txt BASIC_SETUP CMAKE_TARGETS BUILD
                   missing)
+else()
+  message(WARNING "Conan not found. Trying to find Catch2 without it.")
 endif()
 
 # Because of the location of conan.cmake the FindCatch2.cmake generated by conan
 # is not found on windows using msvc so the binary path has to be added to the
 # module path
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
-find_package(Catch2 REQUIRED)
+find_package(Catch2)
+if(NOT Catch2_FOUND)
+  message(WARNING "Catch2 not found, not building tests")
+  return()
+endif()
 
 add_executable(SI_detail_tests)
 target_sources(