CMake: build system fixes

- usage of SORT() was updated
- references to Graphic lib was removed
- added missing header files to install target
- removed debug log in build system
- included ilmControl in default build
- improved ilmCommon install settings
- fixed module search path handling

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

4 files changed, 14 insertions, 16 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0664600..9e3e81e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,9 +25,9 @@ project (LayerManager)
 # cmake configuration
 #===========================================================================================================
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
-include(${CMAKE_MODULE_PATH}/DefaultSettings.txt)
-include(${CMAKE_MODULE_PATH}/CMakeVersions.txt)
-include(${CMAKE_MODULE_PATH}/CustomMacros.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/DefaultSettings.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/CMakeVersions.txt)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/CustomMacros.txt)
 add_subdirectory(cmake/optionalFeatures)
 
 #===========================================================================================================
@@ -49,7 +49,7 @@ build_flag (WITH_STATIC_LIBRARIES "Link all plugins and libraries statically" OF
 build_flag (WITH_STYLE_CHECKING "Report styleguide problems during build (requires python)" OFF)
 #===========================================================================================================
 if (WITH_STYLE_CHECKING)
-    set(CMAKE_C_COMPILE_OBJECT "${CMAKE_C_COMPILE_OBJECT}; echo 'Checking style...<SOURCE>'; ${CMAKE_SOURCE_DIR}/scripts/check_all_styles.py <SOURCE>")
+    set(CMAKE_C_COMPILE_OBJECT "${CMAKE_C_COMPILE_OBJECT}; ${CMAKE_SOURCE_DIR}/scripts/check_all_styles.py <SOURCE>")
     set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT}; ${CMAKE_SOURCE_DIR}/scripts/check_all_styles.py <SOURCE>")
 endif (WITH_STYLE_CHECKING)
 add_custom_target(check-style COMMAND ${CMAKE_SOURCE_DIR}/scripts/check_style.sh)
@@ -181,7 +181,6 @@ endif(WITH_DESKTOP)
 build_flag (WITH_GLX_LIB "Build development library for OpenGL/X11 based renderers" OFF)
 #===========================================================================================================
 if (WITH_GLX_LIB)
-    add_subdirectory_once (LayerManagerPlugins/Renderers/Graphic)
     add_subdirectory_once (LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicGLX)
 endif(WITH_GLX_LIB)
 
@@ -200,7 +199,6 @@ endif(WITH_WAYLAND_X11)
 build_flag (WITH_WAYLAND_X11_LIB "Build development library for GLES/Wayland X11 based renderers" OFF)
 #===========================================================================================================
 if (WITH_WAYLAND_X11_LIB)
-    add_subdirectory_once (LayerManagerPlugins/Renderers/Graphic)
     add_subdirectory_once (LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicWaylandX11GLESv2)
 endif(WITH_WAYLAND_X11_LIB)
 
@@ -219,7 +217,6 @@ endif(WITH_WAYLAND_DRM)
 build_flag (WITH_WAYLAND_DRM_LIB "Build development library for GLES/Wayland DRM based renderers" OFF)
 #===========================================================================================================
 if (WITH_WAYLAND_DRM_LIB)
-    add_subdirectory_once (LayerManagerPlugins/Renderers/Graphic)
     add_subdirectory_once (LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicWaylandDrmGLESv2)
 endif(WITH_WAYLAND_DRM_LIB)
 
@@ -238,7 +235,6 @@ endif(WITH_WAYLAND_FBDEV)
 build_flag (WITH_WAYLAND_FBDEV_LIB "Build development library for GLES/Wayland FBDEV based renderers" OFF)
 #===========================================================================================================
 if (WITH_WAYLAND_FBDEV_LIB)
-    add_subdirectory_once (LayerManagerPlugins/Renderers/Graphic)
     add_subdirectory_once (LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicWaylandFbdevGLESv2)
 endif(WITH_WAYLAND_FBDEV_LIB)
 
@@ -254,7 +250,6 @@ endif(WITH_X11_GLES)
 build_flag (WITH_GLESv2_LIB "Build development library for GLES/X11 based renderers" OFF)
 #===========================================================================================================
 if (WITH_GLESv2_LIB)
-    add_subdirectory_once (LayerManagerPlugins/Renderers/Graphic)
     add_subdirectory_once (LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicGLESv2)
 endif(WITH_GLESv2_LIB)
 
@@ -285,7 +280,7 @@ if (WITH_CLIENT_LIB)
 endif (WITH_CLIENT_LIB)
 
 #===========================================================================================================
-build_flag (WITH_CONTROL_LIB "Build LayerManagement control library" OFF)
+build_flag (WITH_CONTROL_LIB "Build LayerManagement control library" ON)
 #===========================================================================================================
 if (WITH_CONTROL_LIB)
     add_subdirectory_once (LayerManagerUtils)
diff --git a/LayerManagerClient/ilmCommon/CMakeLists.txt b/LayerManagerClient/ilmCommon/CMakeLists.txt
index 5558feb..a5747d6 100644
--- a/LayerManagerClient/ilmCommon/CMakeLists.txt
+++ b/LayerManagerClient/ilmCommon/CMakeLists.txt
@@ -31,7 +31,7 @@ include_directories(
     "${CMAKE_SOURCE_DIR}/LayerManagerUtils/include"
 )
 
-add_library(${PROJECT_NAME} STATIC
+add_library(${PROJECT_NAME} SHARED
     src/ilm_common.c
     src/ilm_tools.c
 )
@@ -50,14 +50,16 @@ set(LIBS
 
 target_link_libraries(${PROJECT_NAME} ${LIBS} -ldl)
 
-#install (
-#    TARGETS             ${PROJECT_NAME}
-#    LIBRARY DESTINATION lib
-#)
+install (
+    TARGETS             ${PROJECT_NAME}
+    LIBRARY DESTINATION lib
+)
 
 install (
     FILES       include/ilm_common.h
                 include/ilm_types.h
+                include/ilm_configuration.h
+                include/ilm_tools.h
                 include/ilm_client_platform.h
     DESTINATION include/ilm
 )
diff --git a/LayerManagerUtils/CMakeLists.txt b/LayerManagerUtils/CMakeLists.txt
index 2a4cc53..1980489 100644
--- a/LayerManagerUtils/CMakeLists.txt
+++ b/LayerManagerUtils/CMakeLists.txt
@@ -69,6 +69,7 @@ install(FILES
             include/LogMessageBuffer.h
             include/IlmMatrix.h
             include/Bitmap.h
+            include/IpcModuleLoader.h
         DESTINATION
             include/layermanager
 )
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 7dc1420..5393626 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -36,7 +36,7 @@ foreach(FLAG ${BUILD_FLAG_LIST})
     SET(EXPORTED_BUILD_FLAGS "${EXPORTED_BUILD_FLAGS}${FLAG}\n")
 endforeach(FLAG ${BUILD_FLAG_LIST})
 
-LIST(SORT BUILD_FLAG_ARRAY BUILD_FLAG_ARRAY)
+LIST(SORT BUILD_FLAG_ARRAY)
 foreach(FLAG ${BUILD_FLAG_ARRAY})
     SET(EXPORTED_BUILD_FLAG_ARRAY "${EXPORTED_BUILD_FLAG_ARRAY}    { DEBUG_FLAG, \"${FLAG} = ${${FLAG}}\" },\n")
 endforeach(FLAG ${BUILD_FLAG_ARRAY})