Merge branch 'develop' of github.com:potassco/plasp into develop

2016-11-14 17:10:07 +01:00 · 2016-11-14 17:10:07 +01:00 · fb3f847f6a
commit fb3f847f6a
parent 2585f726c5 1b56e9ed9b
4 changed files with 5 additions and 5 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,3 @@
-[submodule "tests/catch"]
-	path = tests/catch
-	url = https://github.com/philsquared/Catch.git
+[submodule "lib/catch"]
+	path = lib/catch
+	url = https://github.com/philsquared/Catch
--- a/lib/catch
+++ b/lib/catch
@ -0,0 +1 @@
+Subproject commit e27c4ee04282f60aefcc9b1062a74f92cf6c1a2b
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -5,7 +5,7 @@ file(GLOB core_sources "*.cpp")
 include_directories(
 	${Boost_INCLUDE_DIRS}
 	${PROJECT_SOURCE_DIR}/include
-	catch/single_include
+	${PROJECT_SOURCE_DIR}/lib/catch/single_include
 )

 set(libraries
--- a/tests/catch
+++ b/tests/catch
@ -1 +0,0 @@
-Subproject commit 88732e85b2ac0233bba6fec5c032d02f9c5c230b
				`@ -0,0 +1 @@`
				`Subproject commit e27c4ee04282f60aefcc9b1062a74f92cf6c1a2b`
				`@ -1 +0,0 @@`
				`Subproject commit 88732e85b2ac0233bba6fec5c032d02f9c5c230b`