change catch to submodule

cuavas · Jan 1, 2016 · b4f177b · b4f177b
1 parent cf8b3db
commit b4f177b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 24 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "tinyxml2"]
 	path = tinyxml2
 	url = https://github.com/leethomason/tinyxml2.git
+[submodule "catch"]
+	path = catch
+	url = https://github.com/philsquared/Catch.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # refer to the root source directory of the project as ${MFAST_SOURCE_DIR} and
 # to the root binary directory of the project as ${MFAST_BINARY_DIR}.
 
-cmake_minimum_required(VERSION 2.8.8)
+cmake_minimum_required(VERSION 2.8.0)
 
 
 project (mFAST CXX)
@@ -202,8 +202,8 @@ endmacro()
 
 
 # Includes Catch in the project:
-add_subdirectory(${EXT_PROJECTS_DIR}/catch)
-include_directories(${CATCH_INCLUDE_DIR} ${COMMON_INCLUDES})
+#add_subdirectory(${EXT_PROJECTS_DIR}/catch)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/catch/include ${COMMON_INCLUDES})
 enable_testing()
 
 add_subdirectory (tests)

diff --git a/catch b/catch
diff --git a/external_projects/catch/CMakeLists.txt b/external_projects/catch/CMakeLists.txt
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -68,5 +68,6 @@ else()
     add_test(mfast_test mfast_test)
 endif()
 
-#add_dependencies(mfast_test catch)
+
+# add_dependencies(mfast_test catch)