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

This commit is contained in:
2016-11-14 17:10:07 +01:00
4 changed files with 5 additions and 5 deletions

6
.gitmodules vendored
View File

@@ -1,3 +1,3 @@
[submodule "tests/catch"] [submodule "lib/catch"]
path = tests/catch path = lib/catch
url = https://github.com/philsquared/Catch.git url = https://github.com/philsquared/Catch

1
lib/catch Submodule

Submodule lib/catch added at e27c4ee042

View File

@@ -5,7 +5,7 @@ file(GLOB core_sources "*.cpp")
include_directories( include_directories(
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/include
catch/single_include ${PROJECT_SOURCE_DIR}/lib/catch/single_include
) )
set(libraries set(libraries

Submodule tests/catch deleted from 88732e85b2