[Cmake-commits] CMake branch, next, updated. v2.8.11-2225-g0d39e47

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0d39e472c1f26711adb1d641bfa272080b3a611b (commit)
       via  fda8d2cf30d13de7eb0074f257f25fc63a754d6e (commit)
      from  6ff21a80304dd8f82ab84f23bb170be7eb812e60 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d39e472c1f26711adb1d641bfa272080b3a611b
commit 0d39e472c1f26711adb1d641bfa272080b3a611b
Merge: 6ff21a8 fda8d2c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 27 14:06:14 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 27 14:06:14 2013 -0400

    Merge topic 'fix-qt4_use_modules-QtAx' into next
    
    fda8d2c Qt4Macros: Handle Qt ActiveX libraries in qt4_use_modules.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fda8d2cf30d13de7eb0074f257f25fc63a754d6e
commit fda8d2cf30d13de7eb0074f257f25fc63a754d6e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 23 16:51:11 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon May 27 20:05:28 2013 +0200

    Qt4Macros: Handle Qt ActiveX libraries in qt4_use_modules.
    
    These libraries have non-conventional variable names.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 251d57c..f6c8476 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -451,14 +451,22 @@ function(qt4_use_modules _target _link_type)
   endif()
   foreach(_module ${modules})
     string(TOUPPER ${_module} _ucmodule)
-    if (NOT QT_QT${_ucmodule}_FOUND)
-      message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
-    endif()
-    if ("${_ucmodule}" STREQUAL "MAIN")
-      message(FATAL_ERROR "Can not use \"${_module}\" module with qt4_use_modules.")
+    set(_targetPrefix QT_QT${_ucmodule})
+    if (_ucmodule STREQUAL QAXCONTAINER OR _ucmodule STREQUAL QAXSERVER)
+      if (NOT QT_Q${_ucmodule}_FOUND)
+        message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
+      endif()
+      set(_targetPrefix QT_Q${_ucmodule})
+    else()
+      if (NOT QT_QT${_ucmodule}_FOUND)
+        message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
+      endif()
+      if ("${_ucmodule}" STREQUAL "MAIN")
+        message(FATAL_ERROR "Can not use \"${_module}\" module with qt4_use_modules.")
+      endif()
     endif()
-    target_link_libraries(${_target} ${link_type} ${QT_QT${_ucmodule}_LIBRARY})
-    set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${QT_QT${_ucmodule}_INCLUDE_DIR} ${QT_HEADERS_DIR} ${QT_MKSPECS_DIR}/default)
-    set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${QT_QT${_ucmodule}_COMPILE_DEFINITIONS})
+    target_link_libraries(${_target} ${link_type} ${${_targetPrefix}_LIBRARIES})
+    set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${${_targetPrefix}_INCLUDE_DIR} ${QT_HEADERS_DIR} ${QT_MKSPECS_DIR}/default)
+    set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${${_targetPrefix}_COMPILE_DEFINITIONS})
   endforeach()
 endfunction()

-----------------------------------------------------------------------

Summary of changes:
 Modules/Qt4Macros.cmake |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake