From 91f8b4359b8ee108eb6767c47b8bc7ff79f5c2a8 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Wed, 2 Dec 2015 15:25:27 +0100 Subject: [PATCH] Fixed Tests not including dependencies properly --- src/Game/CMakeLists.txt | 2 +- src/Tests/.gitkeep | 0 src/Tests/CMakeLists.txt | 9 +++++---- 3 files changed, 6 insertions(+), 5 deletions(-) delete mode 100755 src/Tests/.gitkeep diff --git a/src/Game/CMakeLists.txt b/src/Game/CMakeLists.txt index 41cc30eb..c21aaa8a 100644 --- a/src/Game/CMakeLists.txt +++ b/src/Game/CMakeLists.txt @@ -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} ) diff --git a/src/Tests/.gitkeep b/src/Tests/.gitkeep deleted file mode 100755 index e69de29b..00000000 diff --git a/src/Tests/CMakeLists.txt b/src/Tests/CMakeLists.txt index 306d5fdd..697dea29 100644 --- a/src/Tests/CMakeLists.txt +++ b/src/Tests/CMakeLists.txt @@ -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} )