cmake modules: Bugfix correcting the check of the libraries

- During the configure of wayland libraries the path were not
  printed correctly

- Adding Wayland compile flags to main config file.

diff --git a/cmake/modules/FindWayland.cmake b/cmake/modules/FindWayland.cmake
index 931836a..589a26e 100644 (file)
--- a/cmake/modules/FindWayland.cmake
+++ b/cmake/modules/FindWayland.cmake
@@ -8,7 +8,7 @@
 # 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 
+#       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, 
@@ -46,7 +46,7 @@ PATHS /usr/lib /usr/local/lib
 )
 
 SET( WAYLAND_FOUND "NO" )
-IF(WAYLAND_LIBRARIES)
+IF(WAYLAND_CLIENT_LIBRARIES AND WAYLAND_SERVER_LIBRARIES)
     SET( WAYLAND_FOUND "YES" )
     message(STATUS "Found Wayland-Client libs: ${WAYLAND_CLIENT_LIBRARIES}")
     message(STATUS "Found Wayland-Client includes: ${WAYLAND_CLIENT_INCLUDE_DIR}")
@@ -54,7 +54,7 @@ IF(WAYLAND_LIBRARIES)
     message(STATUS "Found Wayland-Server includes: ${WAYLAND_SERVER_INCLUDE_DIR}")
     message(STATUS "Found ffi need by Wayland libs: ${FFI_LIBRARIES}")
     message(STATUS "Found ffi need by Wayland includes: ${FFI_INCLUDE_DIR}")
-ENDIF(WAYLAND_LIBRARIES)
+ENDIF(WAYLAND_CLIENT_LIBRARIES AND WAYLAND_SERVER_LIBRARIES)
 
 MARK_AS_ADVANCED(
   WAYLAND_CLIENT_INCLUDE_DIR

diff --git a/config/config.h.cmake b/config/config.h.cmake
index ab223d0..60a57e7 100644 (file)
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -49,6 +49,9 @@
 // build OpenGL ES 2.0 examples
 #cmakedefine WITH_EGL_EXAMPLE
 
+// build OpenGL ES 2.0 Wayland Examples
+#cmakedefine WITH_WL_EXAMPLE
+
 // force copy of graphic buffers
 #cmakedefine WITH_FORCE_COPY
 
@@ -70,6 +73,9 @@
 // build OpenGL ES 2.0 / X11 renderer
 #cmakedefine WITH_X11_GLES
 
+// use OpenGL ES 2.0 / Wayland renderer
+#cmakedefine WITH_WAYLAND
+
 // use xthreads library
 #cmakedefine WITH_XTHREADS
 
@@ -87,6 +93,7 @@
     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_WL_EXAMPLE     = ${WITH_WL_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}"); \
@@ -94,5 +101,6 @@
     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_WAYLAND        = ${WITH_WAYLAND}"); \
     LOG_DEBUG("Config", "WITH_XTHREADS       = ${WITH_XTHREADS}"); \
     LOG_DEBUG("Config", "WITH_DLT            = ${WITH_DLT}");