File tree Expand file tree Collapse file tree 5 files changed +9
-24
lines changed Expand file tree Collapse file tree 5 files changed +9
-24
lines changed Original file line number Diff line number Diff line change 1
1
[submodule "tinyxml2 "]
2
2
path = tinyxml2
3
3
url = https://github.com/leethomason/tinyxml2.git
4
+ [submodule "catch "]
5
+ path = catch
6
+ url = https://github.com/philsquared/Catch.git
Original file line number Diff line number Diff line change 2
2
# refer to the root source directory of the project as ${MFAST_SOURCE_DIR} and
3
3
# to the root binary directory of the project as ${MFAST_BINARY_DIR}.
4
4
5
- cmake_minimum_required (VERSION 2.8.8 )
5
+ cmake_minimum_required (VERSION 2.8.0 )
6
6
7
7
8
8
project (mFAST CXX)
@@ -202,8 +202,8 @@ endmacro()
202
202
203
203
204
204
# 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} )
207
207
enable_testing ()
208
208
209
209
add_subdirectory (tests)
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 68
68
add_test (mfast_test mfast_test)
69
69
endif ()
70
70
71
- #add_dependencies(mfast_test catch)
71
+
72
+ # add_dependencies(mfast_test catch)
72
73
You can’t perform that action at this time.
0 commit comments