LayerManagerBase: moved library to separate directory

LayerManagerBase library contains all base functionality of
LayerManagement like Scene, GraphicalObjects.

All improtant interfaces are defined by this package.

Signed-off-by: Timo Lotterbach <timo.lotterbach@bmw-carit.de>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b86887..43aa8c2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,6 +202,7 @@ if (WITH_SERVICE_BIN OR WITH_CLIENT_LIB)
 
     if (WITH_SERVICE_BIN)
         add_subdirectory (LayerManagerPlugins/Renderers/Graphic)
+        add_subdirectory (LayerManagerBase)
         add_subdirectory (LayerManagerService)
         set (BUILD_UTILS_LIB ON)
         set (INSTALL_UTILS_LIB ON)

diff --git a/LayerManagerBase/CMakeLists.txt b/LayerManagerBase/CMakeLists.txt
new file mode 100644 (file)
index 0000000..26f51a7
--- /dev/null
+++ b/LayerManagerBase/CMakeLists.txt
@@ -0,0 +1,120 @@
+############################################################################
+# 
+# Copyright 2010-2012 BMW Car IT GmbH
+# 
+# 
+# Licensed under the Apache License, Version 2.0 (the "License"); 
+# you may not use this file except in compliance with the License. 
+# You may obtain a copy of the License at 
+#
+#       http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and 
+# limitations under the License.
+#
+############################################################################
+
+cmake_minimum_required (VERSION 2.6)
+
+project(LayerManagerBase)
+
+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
+    ${CMAKE_SOURCE_DIR}/config
+    ${CMAKE_SOURCE_DIR}/LayerManagerUtils/include
+    ${CMAKE_SOURCE_DIR}/LayerManagerCommands/include
+)
+
+set(SRC_FILES
+    src/Configuration.cpp
+    src/GraphicalObject.cpp
+    src/GraphicalSurface.cpp
+    src/InputManager.cpp
+    src/Layermanager.cpp
+    src/PluginBase.cpp
+    src/PluginManager.cpp
+    src/Scene.cpp
+    src/SignalHandler.cpp
+    src/Shader.cpp
+    src/ShaderProgram.cpp
+    src/ShaderProgramFactory.cpp
+    src/ShaderUniform.cpp
+)
+
+add_library(${PROJECT_NAME} STATIC ${SRC_FILES})
+
+add_dependencies(${PROJECT_NAME}
+    LayerManagerUtils
+)
+
+find_package (Threads)
+set(LIBS ${LIBS}
+    LayerManagerUtils
+    dl
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${DLT_LIBRARY}
+    ${STATICALLY_LINKED_PLUGINS}
+) 
+
+target_link_libraries(${PROJECT_NAME} ${LIBS})
+
+file(GLOB LM_INCLUDES include/*.h)
+
+install (FILES ${LM_INCLUDES} DESTINATION include/layermanager)
+
+
+if (WITH_TESTS)
+
+    find_package (Threads)
+
+    enable_testing()
+
+    set (CMAKE_CXX_FLAGS "")
+
+    add_executable(${PROJECT_NAME}_Test
+        tests/SceneTest.cpp
+        tests/LayermanagerTest.cpp
+        tests/InputManagerTest.cpp
+        tests/GraphicalObjectTest.cpp
+        tests/GraphicalGroupTest.cpp
+        tests/GraphicalSurfaceTest.cpp
+        tests/SurfaceTest.cpp
+        tests/LayerTest.cpp
+        tests/ShaderTest.cpp
+        tests/ShaderUniformTest.cpp
+        tests/ShaderProgramTest.cpp
+        tests/ShaderProgramFactoryTest.cpp
+        tests/RectangleTest.cpp
+    )
+
+    target_link_libraries(${PROJECT_NAME}_Test
+        ${LIBS}
+        LayerManagerBase
+        gtest
+        gmock
+        ${CMAKE_THREAD_LIBS_INIT}
+    )
+
+    add_test(${PROJECT_NAME} ${PROJECT_NAME}_Test)
+
+endif(WITH_TESTS) 
+
+
+#=============================================================
+# configuration depending on system
+#=============================================================
+include(CheckFunctionExists)
+check_function_exists(backtrace_symbols HAVE_BACKTRACE)
+
+include(CheckIncludeFiles)
+check_include_files(execinfo.h HAVE_EXECINFO_H)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/LayerManagerService/src/Configuration.cpp b/LayerManagerBase/src/Configuration.cpp
similarity index 100%
rename from LayerManagerService/src/Configuration.cpp
rename to LayerManagerBase/src/Configuration.cpp

diff --git a/LayerManagerService/src/GraphicalObject.cpp b/LayerManagerBase/src/GraphicalObject.cpp
similarity index 100%
rename from LayerManagerService/src/GraphicalObject.cpp
rename to LayerManagerBase/src/GraphicalObject.cpp

diff --git a/LayerManagerService/src/GraphicalSurface.cpp b/LayerManagerBase/src/GraphicalSurface.cpp
similarity index 100%
rename from LayerManagerService/src/GraphicalSurface.cpp
rename to LayerManagerBase/src/GraphicalSurface.cpp

diff --git a/LayerManagerService/src/InputManager.cpp b/LayerManagerBase/src/InputManager.cpp
similarity index 100%
rename from LayerManagerService/src/InputManager.cpp
rename to LayerManagerBase/src/InputManager.cpp

diff --git a/LayerManagerService/src/Layermanager.cpp b/LayerManagerBase/src/Layermanager.cpp
similarity index 100%
rename from LayerManagerService/src/Layermanager.cpp
rename to LayerManagerBase/src/Layermanager.cpp

diff --git a/LayerManagerService/src/PluginBase.cpp b/LayerManagerBase/src/PluginBase.cpp
similarity index 100%
rename from LayerManagerService/src/PluginBase.cpp
rename to LayerManagerBase/src/PluginBase.cpp

diff --git a/LayerManagerService/src/PluginManager.cpp b/LayerManagerBase/src/PluginManager.cpp
similarity index 100%
rename from LayerManagerService/src/PluginManager.cpp
rename to LayerManagerBase/src/PluginManager.cpp

diff --git a/LayerManagerService/src/Scene.cpp b/LayerManagerBase/src/Scene.cpp
similarity index 100%
rename from LayerManagerService/src/Scene.cpp
rename to LayerManagerBase/src/Scene.cpp

diff --git a/LayerManagerService/src/shader/Shader.cpp b/LayerManagerBase/src/Shader.cpp
similarity index 100%
rename from LayerManagerService/src/shader/Shader.cpp
rename to LayerManagerBase/src/Shader.cpp

diff --git a/LayerManagerService/src/shader/ShaderProgram.cpp b/LayerManagerBase/src/ShaderProgram.cpp
similarity index 100%
rename from LayerManagerService/src/shader/ShaderProgram.cpp
rename to LayerManagerBase/src/ShaderProgram.cpp

diff --git a/LayerManagerService/src/shader/ShaderProgramFactory.cpp b/LayerManagerBase/src/ShaderProgramFactory.cpp
similarity index 100%
rename from LayerManagerService/src/shader/ShaderProgramFactory.cpp
rename to LayerManagerBase/src/ShaderProgramFactory.cpp

diff --git a/LayerManagerService/src/shader/ShaderUniform.cpp b/LayerManagerBase/src/ShaderUniform.cpp
similarity index 100%
rename from LayerManagerService/src/shader/ShaderUniform.cpp
rename to LayerManagerBase/src/ShaderUniform.cpp

diff --git a/LayerManagerService/src/SignalHandler.cpp b/LayerManagerBase/src/SignalHandler.cpp
similarity index 100%
rename from LayerManagerService/src/SignalHandler.cpp
rename to LayerManagerBase/src/SignalHandler.cpp

diff --git a/LayerManagerService/tests/GraphicalGroupTest.cpp b/LayerManagerBase/tests/GraphicalGroupTest.cpp
similarity index 100%
rename from LayerManagerService/tests/GraphicalGroupTest.cpp
rename to LayerManagerBase/tests/GraphicalGroupTest.cpp

diff --git a/LayerManagerService/tests/GraphicalObjectTest.cpp b/LayerManagerBase/tests/GraphicalObjectTest.cpp
similarity index 100%
rename from LayerManagerService/tests/GraphicalObjectTest.cpp
rename to LayerManagerBase/tests/GraphicalObjectTest.cpp

diff --git a/LayerManagerService/tests/GraphicalSurfaceTest.cpp b/LayerManagerBase/tests/GraphicalSurfaceTest.cpp
similarity index 100%
rename from LayerManagerService/tests/GraphicalSurfaceTest.cpp
rename to LayerManagerBase/tests/GraphicalSurfaceTest.cpp

diff --git a/LayerManagerService/tests/InputManagerTest.cpp b/LayerManagerBase/tests/InputManagerTest.cpp
similarity index 100%
rename from LayerManagerService/tests/InputManagerTest.cpp
rename to LayerManagerBase/tests/InputManagerTest.cpp

diff --git a/LayerManagerService/tests/LayerTest.cpp b/LayerManagerBase/tests/LayerTest.cpp
similarity index 100%
rename from LayerManagerService/tests/LayerTest.cpp
rename to LayerManagerBase/tests/LayerTest.cpp

diff --git a/LayerManagerService/tests/LayermanagerTest.cpp b/LayerManagerBase/tests/LayermanagerTest.cpp
similarity index 100%
rename from LayerManagerService/tests/LayermanagerTest.cpp
rename to LayerManagerBase/tests/LayermanagerTest.cpp

diff --git a/LayerManagerService/tests/RectangleTest.cpp b/LayerManagerBase/tests/RectangleTest.cpp
similarity index 100%
rename from LayerManagerService/tests/RectangleTest.cpp
rename to LayerManagerBase/tests/RectangleTest.cpp

diff --git a/LayerManagerService/tests/SceneTest.cpp b/LayerManagerBase/tests/SceneTest.cpp
similarity index 100%
rename from LayerManagerService/tests/SceneTest.cpp
rename to LayerManagerBase/tests/SceneTest.cpp

diff --git a/LayerManagerService/tests/ShaderProgramFactoryTest.cpp b/LayerManagerBase/tests/ShaderProgramFactoryTest.cpp
similarity index 100%
rename from LayerManagerService/tests/ShaderProgramFactoryTest.cpp
rename to LayerManagerBase/tests/ShaderProgramFactoryTest.cpp

diff --git a/LayerManagerService/tests/ShaderProgramTest.cpp b/LayerManagerBase/tests/ShaderProgramTest.cpp
similarity index 100%
rename from LayerManagerService/tests/ShaderProgramTest.cpp
rename to LayerManagerBase/tests/ShaderProgramTest.cpp

diff --git a/LayerManagerService/tests/ShaderTest.cpp b/LayerManagerBase/tests/ShaderTest.cpp
similarity index 100%
rename from LayerManagerService/tests/ShaderTest.cpp
rename to LayerManagerBase/tests/ShaderTest.cpp

diff --git a/LayerManagerService/tests/ShaderUniformTest.cpp b/LayerManagerBase/tests/ShaderUniformTest.cpp
similarity index 100%
rename from LayerManagerService/tests/ShaderUniformTest.cpp
rename to LayerManagerBase/tests/ShaderUniformTest.cpp

diff --git a/LayerManagerService/tests/SurfaceTest.cpp b/LayerManagerBase/tests/SurfaceTest.cpp
similarity index 100%
rename from LayerManagerService/tests/SurfaceTest.cpp
rename to LayerManagerBase/tests/SurfaceTest.cpp

diff --git a/LayerManagerClient/ilmClient/CMakeLists.txt b/LayerManagerClient/ilmClient/CMakeLists.txt
index e9f46f5..fc85062 100644 (file)
--- a/LayerManagerClient/ilmClient/CMakeLists.txt
+++ b/LayerManagerClient/ilmClient/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(
     "include"
     "${CMAKE_SOURCE_DIR}/config"
     "${CMAKE_SOURCE_DIR}/LayerManagerPlugins/IpcModules/IpcModuleLoader/include"
-    "${CMAKE_SOURCE_DIR}/LayerManagerService/include"
+    "${CMAKE_SOURCE_DIR}/LayerManagerBase/include"
 )
 
 add_library(ilmClient SHARED

diff --git a/LayerManagerCommands/CMakeLists.txt b/LayerManagerCommands/CMakeLists.txt
index f46ca35..aea7774 100644 (file)
--- a/LayerManagerCommands/CMakeLists.txt
+++ b/LayerManagerCommands/CMakeLists.txt
@@ -24,7 +24,7 @@ project(LayerManagerCommands)
 include_directories(
     include
     ${CMAKE_SOURCE_DIR}/config
-    ${CMAKE_SOURCE_DIR}/LayerManagerService/include
+    ${CMAKE_SOURCE_DIR}/LayerManagerBase/include
     ${CMAKE_SOURCE_DIR}/LayerManagerUtils/include
 )
 

diff --git a/LayerManagerPlugins/Communicators/GenericCommunicator/CMakeLists.txt b/LayerManagerPlugins/Communicators/GenericCommunicator/CMakeLists.txt
index 1d63f88..9a246b0 100644 (file)
--- a/LayerManagerPlugins/Communicators/GenericCommunicator/CMakeLists.txt
+++ b/LayerManagerPlugins/Communicators/GenericCommunicator/CMakeLists.txt
@@ -27,7 +27,7 @@ project(GenericCommunicator)
 include_directories(
     include
     ${CMAKE_SOURCE_DIR}/LayerManagerClient/ilmClient/include
-    ${CMAKE_SOURCE_DIR}/LayerManagerService/include
+    ${CMAKE_SOURCE_DIR}/LayerManagerBase/include
     ${CMAKE_SOURCE_DIR}/LayerManagerUtils/include
     ${CMAKE_SOURCE_DIR}/LayerManagerCommands/include
     ${CMAKE_SOURCE_DIR}/LayerManagerPlugins/IpcModules/IpcModuleLoader/include

diff --git a/LayerManagerPlugins/HealthMonitor/SystemdHealthMonitor/CMakeLists.txt b/LayerManagerPlugins/HealthMonitor/SystemdHealthMonitor/CMakeLists.txt
index 95a1213..e7eee85 100644 (file)
--- a/LayerManagerPlugins/HealthMonitor/SystemdHealthMonitor/CMakeLists.txt
+++ b/LayerManagerPlugins/HealthMonitor/SystemdHealthMonitor/CMakeLists.txt
@@ -27,7 +27,7 @@ project(SystemdHealthMonitor)
 include_directories(
     include
     ${CMAKE_SOURCE_DIR}/LayerManagerClient/ilmClient/include
-    ${CMAKE_SOURCE_DIR}/LayerManagerService/include
+    ${CMAKE_SOURCE_DIR}/LayerManagerBase/include
     ${CMAKE_SOURCE_DIR}/LayerManagerUtils/include
 )
 

diff --git a/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt b/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt
index fcb857a..53de54d 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt
+++ b/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt
@@ -28,7 +28,7 @@ include_directories(
     "include"
     "../Base/include"
     "${PROJECT_SOURCE_DIR}/config"
-    "${PROJECT_SOURCE_DIR}/LayerManagerService/include"
+    "${PROJECT_SOURCE_DIR}/LayerManagerBase/include"
     "${PROJECT_SOURCE_DIR}/LayerManagerUtils/include"
 )
 

diff --git a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt
index 9df8337..0c1a8c1 100644 (file)
--- a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt
+++ b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/CMakeLists.txt
@@ -22,9 +22,9 @@ 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")
-include_directories ("${PROJECT_SOURCE_DIR}/LayerManagerUtils/include")
+include_directories ("${CMAKE_SOURCE_DIR}/config")
+include_directories ("${CMAKE_SOURCE_DIR}/LayerManagerBase/include")
+include_directories ("${CMAKE_SOURCE_DIR}/LayerManagerUtils/include")
 
 file(GLOB SOURCES 
     src/X11GLXRenderer.cpp 

diff --git a/LayerManagerPlugins/Renderers/Platform/TextRenderer/CMakeLists.txt b/LayerManagerPlugins/Renderers/Platform/TextRenderer/CMakeLists.txt
index 414cc50..054f46d 100644 (file)
--- a/LayerManagerPlugins/Renderers/Platform/TextRenderer/CMakeLists.txt
+++ b/LayerManagerPlugins/Renderers/Platform/TextRenderer/CMakeLists.txt
@@ -30,7 +30,7 @@ include_directories(
     ../../Base/include
     ../../Graphic/include
     ${CMAKE_SOURCE_DIR}/config
-    ${CMAKE_SOURCE_DIR}/LayerManagerService/include
+    ${CMAKE_SOURCE_DIR}/LayerManagerBase/include
     ${CMAKE_SOURCE_DIR}/LayerManagerUtils/include
 )
 

diff --git a/LayerManagerPlugins/Renderers/Platform/WaylandGLESRenderer/CMakeLists.txt b/LayerManagerPlugins/Renderers/Platform/WaylandGLESRenderer/CMakeLists.txt
index 4137861..32933c6 100644 (file)
--- a/LayerManagerPlugins/Renderers/Platform/WaylandGLESRenderer/CMakeLists.txt
+++ b/LayerManagerPlugins/Renderers/Platform/WaylandGLESRenderer/CMakeLists.txt
@@ -37,7 +37,7 @@ include_directories(
     ../../Base/include
     ../../Graphic/include
     ${CMAKE_SOURCE_DIR}/config
-    ${CMAKE_SOURCE_DIR}/LayerManagerService/include
+    ${CMAKE_SOURCE_DIR}/LayerManagerBase/include
     ${CMAKE_SOURCE_DIR}/LayerManagerUtils/include
     ${WAYLAND_SERVER_INCLUDE_DIR}
     ${DRM_INCLUDE_DIR}

diff --git a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt
index 3c80c8a..3f478cf 100644 (file)
--- a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt
+++ b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/CMakeLists.txt
@@ -37,7 +37,7 @@ include_directories(
     ../../Base/include
     ../../Graphic/include
     ${CMAKE_SOURCE_DIR}/config
-    ${CMAKE_SOURCE_DIR}/LayerManagerService/include
+    ${CMAKE_SOURCE_DIR}/LayerManagerBase/include
     ${CMAKE_SOURCE_DIR}/LayerManagerUtils/include
     ${X11_INCLUDE_DIR}
     ${EGL_INCLUDE_DIR}

diff --git a/LayerManagerPlugins/SceneProvider/ExampleSceneProvider/CMakeLists.txt b/LayerManagerPlugins/SceneProvider/ExampleSceneProvider/CMakeLists.txt
index 3a363c7..ea0965c 100644 (file)
--- a/LayerManagerPlugins/SceneProvider/ExampleSceneProvider/CMakeLists.txt
+++ b/LayerManagerPlugins/SceneProvider/ExampleSceneProvider/CMakeLists.txt
@@ -27,7 +27,7 @@ project(ExampleSceneProvider)
 include_directories(
     include
     ${CMAKE_SOURCE_DIR}/LayerManagerCommands/include
-    ${CMAKE_SOURCE_DIR}/LayerManagerService/include
+    ${CMAKE_SOURCE_DIR}/LayerManagerBase/include
 )
 
 set(LIBS

diff --git a/LayerManagerService/CMakeLists.txt b/LayerManagerService/CMakeLists.txt
index 5777a37..4678070 100644 (file)
--- a/LayerManagerService/CMakeLists.txt
+++ b/LayerManagerService/CMakeLists.txt
@@ -19,108 +19,26 @@
 
 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)
+project(LayerManagerService)
 
 include_directories(
-    include
     ${CMAKE_SOURCE_DIR}/config
+    ${CMAKE_SOURCE_DIR}/LayerManagerBase/include
     ${CMAKE_SOURCE_DIR}/LayerManagerUtils/include
-    ${CMAKE_SOURCE_DIR}/LayerManagerCommands/include
 )
 
-set(SRC_FILES
-    src/Configuration.cpp
-    src/GraphicalObject.cpp
-    src/GraphicalSurface.cpp
-    src/InputManager.cpp
-    src/Layermanager.cpp
-    src/PluginBase.cpp
-    src/PluginManager.cpp
-    src/Scene.cpp
-    src/SignalHandler.cpp
-    src/shader/Shader.cpp
-    src/shader/ShaderProgram.cpp
-    src/shader/ShaderProgramFactory.cpp
-    src/shader/ShaderUniform.cpp
+set(LIBS
+    LayerManagerBase
 )
 
-add_library(LayerManagerBase STATIC ${SRC_FILES})
-
-add_executable(LayerManagerService src/main.cpp)
-
-add_dependencies(LayerManagerService LayerManagerBase)
-
-add_dependencies(LayerManagerBase
-    LayerManagerUtils
+set(SRC_FILES
+    src/main.cpp
 )
 
-find_package (Threads)
-set(LIBS ${LIBS}
-    LayerManagerUtils
-    dl
-    ${CMAKE_THREAD_LIBS_INIT}
-    ${DLT_LIBRARY}
-    ${STATICALLY_LINKED_PLUGINS}
-) 
-
-target_link_libraries(LayerManagerBase ${LIBS})
-
-target_link_libraries(LayerManagerService LayerManagerBase)
-
-file(GLOB LM_INCLUDES include/*.h)
-
-install (TARGETS LayerManagerService DESTINATION bin)
-install (FILES ${LM_INCLUDES} DESTINATION include/layermanager)
-
-
-if (WITH_TESTS)
-
-    find_package (Threads)
-
-    enable_testing()
-
-    set (CMAKE_CXX_FLAGS "")
-
-    add_executable(LayerManagerService_Test
-        tests/SceneTest.cpp
-        tests/ScreenTest.cpp
-        tests/LayermanagerTest.cpp
-        tests/InputManagerTest.cpp
-        tests/GraphicalObjectTest.cpp
-        tests/GraphicalGroupTest.cpp
-        tests/GraphicalSurfaceTest.cpp
-        tests/SurfaceTest.cpp
-        tests/LayerTest.cpp
-        tests/ShaderTest.cpp
-        tests/ShaderUniformTest.cpp
-        tests/ShaderProgramTest.cpp
-        tests/ShaderProgramFactoryTest.cpp
-        tests/RectangleTest.cpp
-    )
-
-    target_link_libraries(LayerManagerService_Test
-        ${LIBS}
-        LayerManagerBase
-        gtest
-        gmock
-        ${CMAKE_THREAD_LIBS_INIT}
-    )
-
-    add_test(LayerManagerService LayerManagerService_Test)
-
-endif(WITH_TESTS) 
+add_executable(${PROJECT_NAME} ${SRC_FILES})
 
+add_dependencies(${PROJECT_NAME} ${LIBS})
 
-#=============================================================
-# configuration depending on system
-#=============================================================
-include(CheckFunctionExists)
-check_function_exists(backtrace_symbols HAVE_BACKTRACE)
+target_link_libraries(${PROJECT_NAME} ${LIBS})
 
-include(CheckIncludeFiles)
-check_include_files(execinfo.h HAVE_EXECINFO_H)
+install (TARGETS ${PROJECT_NAME} DESTINATION bin)