[Performous-commit] Lasse Karkkainen : Move local lib include path definitions to root level CMakeLists.txt.

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 01db62c64e4db0401a4c92446bd3bdbb842bd9d0

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Oct 10 13:05:07 2009 +0300

Move local lib include path definitions to root level CMakeLists.txt.

---

 CMakeLists.txt            |    4 ++++
 editor/CMakeLists.txt     |    2 --
 game/CMakeLists.txt       |    2 --
 libs/libda/CMakeLists.txt |    1 -
 tools/CMakeLists.txt      |    2 --
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ff8338..dac5015 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,10 @@ endif(WIN32)
 
 mark_as_advanced(SHARE_INSTALL)
 
+# Need to find the headers even if they haven't been installed yet:
+include_directories(libs/plugin++/include)
+include_directories(libs/libda/include)
+
 add_subdirectory(libs)
 add_subdirectory(themes)
 add_subdirectory(data)
diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt
index 65e7065..c6ecbe8 100644
--- a/editor/CMakeLists.txt
+++ b/editor/CMakeLists.txt
@@ -7,8 +7,6 @@ set(SOURCES ${SOURCE_FILES} ${HEADER_FILES})
 
 # Libraries
 
-include_directories(${CMAKE_SOURCE_DIR}/libs/libda/include)
-
 find_package(Boost 1.34 REQUIRED COMPONENTS thread)
 include_directories(${Boost_INCLUDE_DIRS})
 set(LIBS ${LIBS} ${Boost_LIBRARIES})
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 035021d..e4e484a 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -7,8 +7,6 @@ set(SOURCES ${SOURCE_FILES} ${HEADER_FILES})
 
 # Libraries
 
-include_directories(${CMAKE_SOURCE_DIR}/libs/libda/include)
-
 find_package(Boost 1.34 REQUIRED COMPONENTS thread date_time program_options regex filesystem)
 include_directories(${Boost_INCLUDE_DIRS})
 set(LIBS ${LIBS} ${Boost_LIBRARIES})
diff --git a/libs/libda/CMakeLists.txt b/libs/libda/CMakeLists.txt
index 350aaa6..1770cc5 100644
--- a/libs/libda/CMakeLists.txt
+++ b/libs/libda/CMakeLists.txt
@@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 2.6)
 set(LIBDA_PLUGIN_DIR "lib${LIB_SUFFIX}/libda")
 
 include_directories(include)
-include_directories(../plugin++/include)
 
 FILE(GLOB HEADER_FILES "include/libda/*")
 install(FILES ${HEADER_FILES} DESTINATION include/libda)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 9a26670..5798c96 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 2.6)
 
 # Libraries
 
-include_directories(${CMAKE_SOURCE_DIR}/libda)
-
 find_package(Boost 1.34 REQUIRED COMPONENTS filesystem program_options)
 include_directories(${Boost_INCLUDE_DIRS})