Merge branch 'master' into cmake_include_headers

Conflicts:
	projects/CMake/CMakeLists.txt
This commit is contained in:
Fraser Hutchison
2013-11-29 13:03:00 +00:00
49 changed files with 1630 additions and 2824 deletions

View File

@@ -122,8 +122,6 @@ CheckFileList(CATCH_SINGLE_INCLUDE "single_include")
set(TEST_SOURCES
"${SELF_TEST_DIR}/ApproxTests.cpp"
"${SELF_TEST_DIR}/BDDTests.cpp"
"${SELF_TEST_DIR}/catch_self_test.cpp"
"${SELF_TEST_DIR}/catch_self_test.hpp"
"${SELF_TEST_DIR}/ClassTests.cpp"
"${SELF_TEST_DIR}/CmdLineTests.cpp"
"${SELF_TEST_DIR}/ConditionTests.cpp"