Test that the CMAKE_AUTOMOC feature works with Qt5.

Update the wrapper macro which had bitrotted a bit.

Change-Id: I65c7940f9ebc0e1c963fddd2bbfc06b89e66df04
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

diff --git a/tests/manual/cmake/CMakeLists.txt b/tests/manual/cmake/CMakeLists.txt
index 1f2bd3e..91ead64 100644 (file)
--- a/tests/manual/cmake/CMakeLists.txt
+++ b/tests/manual/cmake/CMakeLists.txt
@@ -25,8 +25,10 @@ macro(expect_fail _dir)
     endif()
 endmacro()
 
-# Requires a patched cmake for the automoc stuff. Will uncomment when it is released.
-# expect_pass(pass1)
+if(${CMAKE_VERSION} VERSION_GREATER 2.8.7)
+    # Requires CMAKE_AUTOMOC function in CMake 2.8.7
+    expect_pass(pass1)
+endif()
 expect_pass(pass2)
 expect_pass(pass3)
 expect_fail(fail4)

diff --git a/tests/manual/cmake/pass1/CMakeLists.txt b/tests/manual/cmake/pass1/CMakeLists.txt
index c41a904..f11887e 100644 (file)
--- a/tests/manual/cmake/pass1/CMakeLists.txt
+++ b/tests/manual/cmake/pass1/CMakeLists.txt
@@ -3,23 +3,23 @@ cmake_minimum_required(VERSION 2.8)
 
 project(pass1)
 
-# Warning: requires cmake 2.8.7 due for release in December 2011
-# for automatic moc with Qt 5
 set(CMAKE_AUTOMOC ON)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 macro(qt5_use_package _target _package)
-    # TODO: Handle public/private keywords?
-    find_package(Qt5${_package} ${ARG1})
+    if (NOT Qt5${_package}_FOUND)
+        find_package(Qt5${_package} ${ARG1})
+    endif()
     if (Qt5${_package}_FOUND)
+        # TODO: Handle public/private keywords?
         target_link_libraries(${_target} ${Qt5${_package}_LIBRARIES})
-        include_directories(${Qt5${_package}_INCLUDE_DIRS})
+        # ### Requires CMake 2.8.8:
         # set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_package}_INCLUDE_DIRS})
+        include_directories(${Qt5${_package}_INCLUDE_DIRS})
         set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_package}_COMPILE_DEFINITIONS})
-        foreach(_dep ${_Qt5_MODULE_DEPENDENCIES})
-            qt5_use_package(${_target} ${_dep} REQUIRED)
-        endforeach()
+    else()
+        message(FATAL_ERROR "NOT FOUND: Qt5${_package}")
     endif()
 endmacro()