Fix AluminumNew tests

Author: ahojukka5

apps/aluminumNew/CMakeLists.txt

@@ -8,20 +8,24 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
     find_package(nlohmann_json REQUIRED)
     set(CMAKE_CXX_STANDARD 17)
-    find_package(Catch2)
 endif()
 
 add_executable(aluminumNew aluminumNew.cpp)
 target_link_libraries(aluminumNew OpenPFC nlohmann_json::nlohmann_json)
 
-if(TARGET Catch2::Catch2WithMain)
-    add_executable(aluminumTest aluminumTest.cpp)
-    target_link_libraries(aluminumTest OpenPFC nlohmann_json::nlohmann_json Catch2::Catch2WithMain)
-    list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
-    include(CTest)
-    catch_discover_tests(aluminumTest)
-else()
-    message(STATUS "Aluminum: Catch2 not found, not building tests")
+option(ALUMINUM_ENABLE_TESTS "Enable building Aluminum tests" ON)
+
+if(ALUMINUM_ENABLE_TESTS)
+    find_package(Catch2 REQUIRED)
+    if(TARGET Catch2::Catch2WithMain)
+        add_executable(aluminumTest aluminumTest.cpp)
+        target_link_libraries(aluminumTest OpenPFC nlohmann_json::nlohmann_json Catch2::Catch2WithMain)
+        include(CTest)
+        include(Catch)
+        catch_discover_tests(aluminumTest)
+    else()
+        message(WARNING "Aluminum: Catch2 not found, not building tests")
+    endif()
 endif()
 
 install(TARGETS aluminumNew DESTINATION bin)