Skip to content

Commit b4f177b

Browse files
author
Huang-Ming Huang
committed
change catch to submodule
1 parent cf8b3db commit b4f177b

File tree

5 files changed

+9
-24
lines changed

5 files changed

+9
-24
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "tinyxml2"]
22
path = tinyxml2
33
url = https://github.com/leethomason/tinyxml2.git
4+
[submodule "catch"]
5+
path = catch
6+
url = https://github.com/philsquared/Catch.git

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# refer to the root source directory of the project as ${MFAST_SOURCE_DIR} and
33
# to the root binary directory of the project as ${MFAST_BINARY_DIR}.
44

5-
cmake_minimum_required(VERSION 2.8.8)
5+
cmake_minimum_required(VERSION 2.8.0)
66

77

88
project (mFAST CXX)
@@ -202,8 +202,8 @@ endmacro()
202202

203203

204204
# Includes Catch in the project:
205-
add_subdirectory(${EXT_PROJECTS_DIR}/catch)
206-
include_directories(${CATCH_INCLUDE_DIR} ${COMMON_INCLUDES})
205+
#add_subdirectory(${EXT_PROJECTS_DIR}/catch)
206+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/catch/include ${COMMON_INCLUDES})
207207
enable_testing()
208208

209209
add_subdirectory (tests)

catch

Submodule catch added at d758428

external_projects/catch/CMakeLists.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

tests/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,6 @@ else()
6868
add_test(mfast_test mfast_test)
6969
endif()
7070

71-
#add_dependencies(mfast_test catch)
71+
72+
# add_dependencies(mfast_test catch)
7273

0 commit comments

Comments
 (0)