LayerManagerService: Moving config file to new location

- The config file should be available at all sub modules
- Therefore it was moved to an own directory

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b42ba3..4c9e0bb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,14 @@ option (WITH_DLT            "Build with DLT support "
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 
+# generate cmake configuration header file, includes information on the
+# project configuration, compiler settings, ...
+message(STATUS "Generating config.h header file with build system configuration.")
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/config/config.h.cmake
+    ${CMAKE_CURRENT_SOURCE_DIR}/config/config.h
+)
+
 if (WITH_DESKTOP)
     set (WITH_GLX_LIB ON CACHE STRING "" FORCE)
 endif(WITH_DESKTOP)     
@@ -62,9 +70,9 @@ include_directories ("${PROJECT_SOURCE_DIR}/3rdParty/")
 add_subdirectory (3rdParty)
 add_subdirectory (LayerManagerPlugins/Communicators/DBUSCommunicator)
 add_subdirectory (LayerManagerClient/ilmClient)
-add_subdirectory (LayerManagerUtils)
 add_subdirectory (LayerManagerCommands)
 add_subdirectory (LayerManagerService)
+add_subdirectory (LayerManagerUtils)
 
 if (WITH_GLESv2_LIB OR WITH_GLX_LIB)
     add_subdirectory (LayerManagerPlugins/Renderers/Graphic)

diff --git a/LayerManagerCommands/CMakeLists.txt b/LayerManagerCommands/CMakeLists.txt
index 22eea97..c44c044 100644 (file)
--- a/LayerManagerCommands/CMakeLists.txt
+++ b/LayerManagerCommands/CMakeLists.txt
@@ -20,6 +20,7 @@
 cmake_minimum_required (VERSION 2.6)
 
 include_directories ("include")
+include_directories ("${PROJECT_SOURCE_DIR}/config")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerService/include")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerUtils/include")
 link_directories ("${PROJECT_SOURCE_DIR}/LayerManagerUtils/bin")

diff --git a/LayerManagerPlugins/Communicators/DBUSCommunicator/CMakeLists.txt b/LayerManagerPlugins/Communicators/DBUSCommunicator/CMakeLists.txt
index 74a40f2..baea0fc 100644 (file)
--- a/LayerManagerPlugins/Communicators/DBUSCommunicator/CMakeLists.txt
+++ b/LayerManagerPlugins/Communicators/DBUSCommunicator/CMakeLists.txt
@@ -20,6 +20,7 @@
 cmake_minimum_required (VERSION 2.6)
 
 include_directories ("include")
+include_directories ("${PROJECT_SOURCE_DIR}/config")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerService/include")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerUtils/include")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerCommands/include")

diff --git a/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt b/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt
index 2338dd6..fed3251 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt
+++ b/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt
@@ -21,7 +21,7 @@ cmake_minimum_required (VERSION 2.6)
 
 include_directories ("include")
 include_directories ("../Base/include")
-
+include_directories ("${PROJECT_SOURCE_DIR}/config")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerService/include")
 link_directories ("${PROJECT_SOURCE_DIR}/LayerManagerService/bin")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerUtils/include")

diff --git a/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/X11WindowSystem.h b/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/X11WindowSystem.h
index 4a50f09..befc375 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/X11WindowSystem.h
+++ b/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/X11WindowSystem.h
@@ -27,7 +27,6 @@
 #include <X11/Xutil.h>
 #include "Log.h"
 #include "ScreenShotType.h"
-#include "config.h"
 
 
 typedef XVisualInfo* (*GetVisualInfoFunction)(Display *dpy);

diff --git a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
index 3301046..dd1a333 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
+++ b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
@@ -18,6 +18,7 @@
 ****************************************************************************/
 
 #include "WindowSystems/X11WindowSystem.h"
+#include "config.h"
 #include "Log.h"
 #include "Layer.h"
 #include <time.h>

diff --git a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt
index 6cca756..3457454 100644 (file)
--- a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt
+++ b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt
@@ -22,7 +22,7 @@ cmake_minimum_required (VERSION 2.6)
 include_directories ("include")
 include_directories ("../../Base/include")
 include_directories ("../../Graphic/include")
-
+include_directories ("${PROJECT_SOURCE_DIR}/config")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerService/include")
 link_directories ("${PROJECT_SOURCE_DIR}/LayerManagerService/bin")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerUtils/include")

diff --git a/LayerManagerService/CMakeLists.txt b/LayerManagerService/CMakeLists.txt
index 525d1ea..c7b973b 100644 (file)
--- a/LayerManagerService/CMakeLists.txt
+++ b/LayerManagerService/CMakeLists.txt
@@ -20,26 +20,23 @@
 cmake_minimum_required (VERSION 2.6)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xlinker -export-dynamic")
+if (WITH_DLT)
+find_package(AutomotiveDlt REQUIRED)
+include_directories(${DLT_INCLUDE_DIR})
+endif (WITH_DLT)
 
 include_directories ("include")
+include_directories ("${PROJECT_SOURCE_DIR}/config")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerUtils/include")
 include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerCommands/include")
 
 link_directories ("${PROJECT_SOURCE_DIR}/LayerManagerUtils/bin")
 link_directories ("${PROJECT_SOURCE_DIR}/LayerManagerCommands")
 
-# generate cmake configuration header file, includes information on the
-# project configuration, compiler settings, ...
-message(STATUS "Generating config.h header file with build system configuration.")
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/config.h
-)
-
 file(GLOB LM_SOURCES src/*.cpp src/shader/*.cpp)
 file(GLOB LM_INCLUDES include/*.h)
 
-add_executable(LayerManagerService ${LM_SOURCES} ${LM_INCLUDES} include/config.h)
+add_executable(LayerManagerService ${LM_SOURCES} ${LM_INCLUDES} ${PROJECT_SOURCE_DIR}/config/config.h)
 
 add_dependencies(LayerManagerService LayerManagerUtils)
 add_dependencies(LayerManagerService LayerManagerCommands)
@@ -52,6 +49,7 @@ set(LIBS ${LIBS}
          dl
          ${CMAKE_THREAD_LIBS_INIT}
          ${DLT_LIBRARY}) 
+
 target_link_libraries(LayerManagerService ${LIBS})
 
 install (TARGETS LayerManagerService DESTINATION bin)

diff --git a/LayerManagerUtils/CMakeLists.txt b/LayerManagerUtils/CMakeLists.txt
index 8d55eec..7b8b5e3 100644 (file)
--- a/LayerManagerUtils/CMakeLists.txt
+++ b/LayerManagerUtils/CMakeLists.txt
@@ -20,7 +20,7 @@
 cmake_minimum_required (VERSION 2.6)
 
 include_directories ("include")
-include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerService/include")
+include_directories ("${PROJECT_SOURCE_DIR}/config")
 if (WITH_DLT)
 find_package(AutomotiveDlt REQUIRED)
 include_directories(${DLT_INCLUDE_DIR})
@@ -28,7 +28,6 @@ endif (WITH_DLT)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 add_library(LayerManagerUtils STATIC src/Bitmap.cpp src/IlmMatrix.cpp src/Log.cpp src/LogMessageBuffer.cpp)
-
 install (FILES include/Log.h include/LogMessageBuffer.h include/IlmMatrix.h include/Bitmap.h DESTINATION include/layermanager)
 
 install (TARGETS LayerManagerUtils ARCHIVE DESTINATION lib/layermanager/static)

diff --git a/LayerManagerService/include/config.h.cmake b/config/config.h.cmake
similarity index 100%
rename from LayerManagerService/include/config.h.cmake
rename to config/config.h.cmake