Merge branch 'master' into ecs

2015-12-03 16:55:32 +01:00
parent 032b384f3f 91f8b4359b
commit 9fb8af8491
3 changed files with 6 additions and 5 deletions
@@ -4,8 +4,8 @@ find_package(Boost REQUIRED COMPONENTS system filesystem thread chrono)

 set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include/Game)
 include_directories(
-    ${CMAKE_SOURCE_DIR}/include/Engine
    ${CMAKE_SOURCE_DIR}/deps/include
+    ${CMAKE_SOURCE_DIR}/include/Engine
    ${INCLUDE_PATH}
    ${Boost_INCLUDE_DIRS}
 )
@@ -2,11 +2,12 @@ project(TacticalZ-Tests)

 find_package(Boost REQUIRED COMPONENTS chrono thread unit_test_framework)

-set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include)
+set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include/Tests)
 include_directories(
-    ${INCLUDE_PATH}/Engine
-    ${INCLUDE_PATH}/Game
-    ${INCLUDE_PATH}/Tests
+    ${CMAKE_SOURCE_DIR}/deps/include
+    ${CMAKE_SOURCE_DIR}/include/Engine
+    ${CMAKE_SOURCE_DIR}/include/Game
+    ${INCLUDE_PATH}
    ${Boost_INCLUDE_DIRS}
 )