Update find catch so it uses the one installed if available

DCNick3 · Sep 8, 2018 · c355532 · c355532
1 parent c8de5c1
commit c355532
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/modules/FindCatch.cmake b/modules/FindCatch.cmake
@@ -16,7 +16,10 @@ if(Catch_FOUND)
   return()
 endif()
 
-find_path(CATCH_INCLUDE_DIR catch.hpp PATHS ${EXTERNAL_ROOT}/include)
+find_path(CATCH_INCLUDE_DIR catch.hpp PATHS /usr/include ${EXTERNAL_ROOT}/include PATH_SUFFIXES catch2)
+# <package>_FIND_VERSION var dessapears after the first time this runs
+set(Catch_WANTED_VERSION ${Catch_FIND_VERSION})
+
 if(CATCH_INCLUDE_DIR)
   file(
     STRINGS ${CATCH_INCLUDE_DIR}/catch.hpp
@@ -32,8 +35,12 @@ if(CATCH_INCLUDE_DIR)
   )
 endif()
 
-set(CATCH_INCLUDE_DIRS ${CATCH_INCLUDE_DIR} )
-set(Catch_INCLUDE_DIRS ${CATCH_INCLUDE_DIR} )
+if(Catch_FIND_VERSION AND (NOT "${CATCH_VERSION_STRING}" STREQUAL "${Catch_FIND_VERSION}"))
+  set(CATCH_INCLUDE_DIR "")
+else()
+  set(CATCH_INCLUDE_DIRS ${CATCH_INCLUDE_DIR} )
+  set(Catch_INCLUDE_DIRS ${CATCH_INCLUDE_DIR} )
+endif()
 
 if(CATCH_INCLUDE_DIR)
   try_run(CATCH_RUNS CATCH_COMPILES

diff --git a/modules/LookUpCatch.cmake b/modules/LookUpCatch.cmake
@@ -55,11 +55,12 @@ ExternalProject_Add(
     PREFIX "${EXTERNAL_ROOT}"
     DOWNLOAD_COMMAND ""
     # ARGUMENTS
-    # Force separate output paths for debug and release builds to allow easy
-
+    # identification of correct lib in subsequent TARGET_LINK_LIBRARIES commands
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
     # Wrap download, configure and build steps in a script to log output
     UPDATE_COMMAND ""
     LOG_DOWNLOAD ON LOG_CONFIGURE ON LOG_BUILD ON LOG_INSTALL ON
 )
 
-add_recursive_cmake_step(Lookup-Catch DEPENDEES install)
diff --git a/scripts/AddCatchTest.cmake b/scripts/AddCatchTest.cmake
@@ -1,8 +1,8 @@
 # First finds or downloads catch
-find_package(Catch)
 
-if(NOT CATCH_FOUND)
-  # setups things so include can be found
+if(NOT Catch_FOUND AND Catch_WANTED_VERSION)
+  lookup_package(Catch REQUIRED ARGUMENTS VERSION ${Catch_WANTED_VERSION})
+else(NOT Catch_FOUND)
   lookup_package(Catch REQUIRED)
 endif()