Merge pull request #312 from zrax/catch2_v3

Update to Catch2 3.x and allow it to be found from the system (or vcpkg)

Author: zrax

.github/workflows/linux-ci.yml

@@ -9,7 +9,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libjpeg-turbo8-dev libpng-dev
+          sudo apt-get install -y libjpeg-turbo8-dev libpng-dev catch2
       - name: Build string_theory
         run: |
           mkdir -p build_deps && cd build_deps

Tests/CMakeLists.txt

@@ -1,19 +1,35 @@
-include(FetchContent)
-FetchContent_Declare(Catch2
-    GIT_REPOSITORY  https://github.com/catchorg/Catch2.git
-    GIT_TAG         v2.13.10
-)
-FetchContent_MakeAvailable(Catch2)
+find_package(Catch2 3.4 QUIET)
+if(NOT Catch2_FOUND)
+    # Force Catch2 to be built as a static lib
+    set(BUILD_SHARED_LIBS__save ${BUILD_SHARED_LIBS})
+    set(BUILD_SHARED_LIBS OFF)
+
+    include(FetchContent)
+    FetchContent_Declare(Catch2
+        GIT_REPOSITORY  https://github.com/catchorg/Catch2.git
+        GIT_TAG         v3.11.0
+    )
+    FetchContent_MakeAvailable(Catch2)
+    list(APPEND CMAKE_MODULE_PATH "${catch2_SOURCE_DIR}/contrib")
+
+    set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS__save})
+endif()
 
 set(test_SOURCES
-    catch2_main.cpp
     Test_Location.cpp
 )
 add_executable(test_HSPlasma ${test_SOURCES})
-target_link_libraries(test_HSPlasma PRIVATE Catch2::Catch2 HSPlasma)
+target_link_libraries(test_HSPlasma PRIVATE Catch2::Catch2WithMain HSPlasma)
+
+if(WIN32 AND BUILD_SHARED_LIBS)
+    # Catch2 needs the HSPlasma DLL available to run <test_executable> --list-tests
+    add_custom_command(
+        TARGET test_HSPlasma PRE_BUILD
+        COMMAND "${CMAKE_COMMAND}" -E copy $<TARGET_FILE:HSPlasma> $<TARGET_FILE_DIR:test_HSPlasma>
+    )
+endif()
 
 # Integrate with CTest so we can use the built-in test targets
-list(APPEND CMAKE_MODULE_PATH "${catch2_SOURCE_DIR}/contrib")
 include(CTest)
 include(Catch)
 catch_discover_tests(test_HSPlasma)

Tests/Test_Location.cpp

@@ -14,7 +14,7 @@
  * along with HSPlasma.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "PRP/KeyedObject/plLocation.h"