Merge pull request #14 from threeal/simplify-cpm-add-package

Simplify CPM Add Package
threeal · Dec 21, 2022 · 6924616 · 6924616
2 parents a7b06e8 + 8c5da35
commit 6924616
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,22 +1,23 @@
 cmake_minimum_required(VERSION 3.14)
 
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wshadow -Wnon-virtual-dtor -Wpedantic")
 
 project(result)
 
-include(Format)
+include(cmake/CPM.cmake)
+cpmaddpackage("gh:TheLartians/[email protected]")
 
 add_library(result INTERFACE)
 target_include_directories(result INTERFACE include)
 
 if(BUILD_TESTING)
   enable_testing()
 
-  find_package(Catch2 REQUIRED)
-
+  cpmaddpackage("gh:catchorg/Catch2@3.2.0")
+  include("${Catch2_SOURCE_DIR}/extras/Catch.cmake")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage -fPIC -O0")
+
   add_executable(result_test test/result_test.cpp test/result_or_test.cpp)
   target_link_libraries(result_test PRIVATE result Catch2::Catch2WithMain)
   catch_discover_tests(result_test)

diff --git a/cmake/FindCatch2.cmake b/cmake/FindCatch2.cmake
diff --git a/cmake/Format.cmake b/cmake/Format.cmake