renamed CmakeConfiguration.h to config.h and updated internal names

diff --git a/LayerManagerService/CMakeLists.txt b/LayerManagerService/CMakeLists.txt
index c7a0161..b9d6c4f 100644 (file)
--- a/LayerManagerService/CMakeLists.txt
+++ b/LayerManagerService/CMakeLists.txt
@@ -30,10 +30,10 @@ link_directories ("${PROJECT_SOURCE_DIR}/LayerManagerCommands")
 
 # generate cmake configuration header file, includes information on the
 # project configuration, compiler settings, ...
-message(STATUS "Generating CmakeConfiguration.h header file with build system configuration.")
+message(STATUS "Generating config.h header file with build system configuration.")
 configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/CmakeConfiguration.h.in
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/CmakeConfiguration.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/config.h
 )
 
 file(GLOB LM_SOURCES src/*.cpp src/shader/*.cpp)

diff --git a/LayerManagerService/include/.gitignore b/LayerManagerService/include/.gitignore
index 91809bb..0e56cf2 100644 (file)
--- a/LayerManagerService/include/.gitignore
+++ b/LayerManagerService/include/.gitignore
@@ -1 +1 @@
-CmakeConfiguration.h
+config.h

diff --git a/LayerManagerService/include/CmakeConfiguration.h.in b/LayerManagerService/include/config.h.cmake
similarity index 54%
rename from LayerManagerService/include/CmakeConfiguration.h.in
rename to LayerManagerService/include/config.h.cmake
index 783f762..db2a1dc 100644 (file)
--- a/LayerManagerService/include/CmakeConfiguration.h.in
+++ b/LayerManagerService/include/config.h.cmake
@@ -16,8 +16,8 @@
  * limitations under the License.
  *
  ****************************************************************************/
-#ifndef _CMAKECONFIGURATION_H_
-#define _CMAKECONFIGURATION_H_
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
 
 #include "Log.h"
 
@@ -27,47 +27,78 @@
 //-----------------------------------------------------------------------------
 // string variables
 //-----------------------------------------------------------------------------
+// version of the LayerManagementService
 const char* ILM_VERSION          = "${ILM_VERSION}";
+
+// CMake build type, e.g. Debug, Release
 const char* CMAKE_BUILD_TYPE     = "${CMAKE_BUILD_TYPE}";
+
+// compiler flags used to build project
 const char* CMAKE_CXX_FLAGS      = "${CMAKE_CXX_FLAGS}";
+
+// install prefix of target platform
 const char* CMAKE_INSTALL_PREFIX = "${CMAKE_INSTALL_PREFIX}";
 
+
 //-----------------------------------------------------------------------------
 // build flags
 //-----------------------------------------------------------------------------
+// build client examples
 #cmakedefine WITH_CLIENTEXAMPLES
+
+// build OpenGL/X11 based renderer
 #cmakedefine WITH_DESKTOP
+
+// build OpenGL ES 2.0 examples
 #cmakedefine WITH_EGL_EXAMPLE
+
+// force copy of graphic buffers
 #cmakedefine WITH_FORCE_COPY
+
+// Build development library for GLES2 Based Renderers
 #cmakedefine WITH_GLESv2_LIB
+
+// build OpenGL/X11 examples
 #cmakedefine WITH_GLX_EXAMPLE
+
+// Build development library for GLX Based Renderers
 #cmakedefine WITH_GLX_LIB
+
+// enable input event handling
 #cmakedefine WITH_INPUT_EVENTS
+
+// build unit tests for all projects
 #cmakedefine WITH_TESTS
+
+// build OpenGL ES 2.0/X11 renderer
 #cmakedefine WITH_X11_GLES
+
+// use xthreads library
 #cmakedefine WITH_XTHREADS
 
+
 //-----------------------------------------------------------------------------
 // human readable report
 //-----------------------------------------------------------------------------
 void printCmakeConfiguration(void)
 {
-    LOG_INFO ("CmakeConfiguration", "LayerManager Version = " << ILM_VERSION);
-    LOG_DEBUG("CmakeConfiguration", "Build Type           = " << CMAKE_BUILD_TYPE);
-    LOG_DEBUG("CmakeConfiguration", "Compiler Flags       = " << CMAKE_CXX_FLAGS);
-    LOG_DEBUG("CmakeConfiguration", "Install Prefix       = " << CMAKE_INSTALL_PREFIX);
-
-    LOG_DEBUG("CmakeConfiguration", "WITH_CLIENTEXAMPLES  = ${WITH_CLIENTEXAMPLES}");
-    LOG_DEBUG("CmakeConfiguration", "WITH_DESKTOP         = ${WITH_DESKTOP}");
-    LOG_DEBUG("CmakeConfiguration", "WITH_EGL_EXAMPLE     = ${WITH_EGL_EXAMPLE}");
-    LOG_DEBUG("CmakeConfiguration", "WITH_FORCE_COPY      = ${WITH_FORCE_COPY}");
-    LOG_DEBUG("CmakeConfiguration", "WITH_GLESv2_LIB      = ${WITH_GLESv2_LIB}");
-    LOG_DEBUG("CmakeConfiguration", "WITH_GLX_EXAMPLE     = ${WITH_GLX_EXAMPLE}");
-    LOG_DEBUG("CmakeConfiguration", "WITH_GLX_LIB         = ${WITH_GLX_LIB}");
-    LOG_DEBUG("CmakeConfiguration", "WITH_INPUT_EVENTS    = ${WITH_INPUT_EVENTS}");
-    LOG_DEBUG("CmakeConfiguration", "WITH_TESTS           = ${WITH_TESTS}");
-    LOG_DEBUG("CmakeConfiguration", "WITH_X11_GLES        = ${WITH_X11_GLES}");
-    LOG_DEBUG("CmakeConfiguration", "WITH_XTHREADS        = ${WITH_XTHREADS}");
+    LOG_INFO ("Config", "Build Version       = " << ILM_VERSION);
+    LOG_DEBUG("Config", "Build Type          = " << CMAKE_BUILD_TYPE);
+    LOG_DEBUG("Config", "Compiler Flags      = " << CMAKE_CXX_FLAGS);
+    LOG_DEBUG("Config", "Install Prefix      = " << CMAKE_INSTALL_PREFIX);
+
+    LOG_DEBUG("Config", "WITH_CLIENTEXAMPLES = ${WITH_CLIENTEXAMPLES}");
+    LOG_DEBUG("Config", "WITH_DESKTOP        = ${WITH_DESKTOP}");
+    LOG_DEBUG("Config", "WITH_EGL_EXAMPLE    = ${WITH_EGL_EXAMPLE}");
+    LOG_DEBUG("Config", "WITH_FORCE_COPY     = ${WITH_FORCE_COPY}");
+    LOG_DEBUG("Config", "WITH_GLESv2_LIB     = ${WITH_GLESv2_LIB}");
+    LOG_DEBUG("Config", "WITH_GLX_EXAMPLE    = ${WITH_GLX_EXAMPLE}");
+    LOG_DEBUG("Config", "WITH_GLX_LIB        = ${WITH_GLX_LIB}");
+    LOG_DEBUG("Config", "WITH_INPUT_EVENTS   = ${WITH_INPUT_EVENTS}");
+    LOG_DEBUG("Config", "WITH_TESTS          = ${WITH_TESTS}");
+    LOG_DEBUG("Config", "WITH_X11_GLES       = ${WITH_X11_GLES}");
+    LOG_DEBUG("Config", "WITH_XTHREADS       = ${WITH_XTHREADS}");
 }
 
-#endif // _CMAKECONFIGURATION_H_
+#endif // _CONFIG_H_
+

diff --git a/LayerManagerService/src/main.cpp b/LayerManagerService/src/main.cpp
index 3e83dbd..7b4038d 100644 (file)
--- a/LayerManagerService/src/main.cpp
+++ b/LayerManagerService/src/main.cpp
@@ -18,7 +18,7 @@
  ****************************************************************************/
 
 #include "Layermanager.h"
-#include "CmakeConfiguration.h"
+#include "config.h"
 #include "IRenderer.h"
 #include "ICommunicator.h"
 #include "ISceneProvider.h"
@@ -367,7 +367,7 @@ int main(int argc, char **argv)
     char* pluginLookupPath = getenv("LM_PLUGIN_PATH");
     LOG_INFO("LayerManagerService", "Starting Layermanager.");
 
-    printCmakeConfiguration();
+    printConfiguration();
 
     if  (pluginLookupPath != NULL ) 
     {