Adds version number to catch

DCNick3 · Feb 3, 2017 · 0e978cd · 0e978cd
1 parent 2577c7d
commit 0e978cd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/modules/FindCatch.cmake b/modules/FindCatch.cmake
@@ -3,10 +3,26 @@ if(Catch_FOUND)
   return()
 endif()
 find_path(CATCH_INCLUDE_DIR catch.hpp PATHS ${EXTERNAL_ROOT}/include)
+if(CATCH_INCLUDE_DIR)
+  file(
+    STRINGS ${CATCH_INCLUDE_DIR}/Catch.hpp
+    CATCH_VERSION_STRING
+    REGEX "[ ]+Catch[ ]+v([0-9]*\\.[0-9]*\\.[0-9]*)"
+  )
+  string(
+    REGEX REPLACE
+    ".*[ ]+Catch[ ]+v([0-9]*\\.[0-9]*\\.[0-9]*)"
+    "\\1"
+    CATCH_VERSION_STRING
+    "${CATCH_VERSION_STRING}"
+  )
+endif()
 
 set(CATCH_INCLUDE_DIRS ${CATCH_INCLUDE_DIR} )
 
 include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(Catch  DEFAULT_MSG CATCH_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+  Catch
+  REQUIRED_VARS CATCH_INCLUDE_DIR
+  VERSION_VAR CATCH_VERSION_STRING
+)
diff --git a/tests/addcatchtest.cmake b/tests/addcatchtest.cmake
@@ -6,6 +6,10 @@ if(tests)
   enable_testing()
 endif(tests)
 
+if(NOT CATCH_VERSION_STRING)
+  message(FATAL_ERROR "NO Catch version defined")
+endif()
+
 file(WRITE ${CMAKE_SOURCE_DIR}/mytest.cc
      "#include <catch.hpp>\n\n"
      "TEST_CASE(\"A test case\") {\n"