[Cmake-commits] CMake branch, next, updated. v2.8.11-2415-gc74d498

[Brad King]

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  c74d498b683fb1cd448775e96990e96ab2416a30 (commit)
       via  ce0c4802c02c98fffd66fe42944d255a0e7da026 (commit)
      from  ad9c60d132a9bfd390543282b9a31880635df690 (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=c74d498b683fb1cd448775e96990e96ab2416a30
commit c74d498b683fb1cd448775e96990e96ab2416a30
Merge: ad9c60d ce0c480
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 3 09:42:35 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 3 09:42:35 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce0c4802c02c98fffd66fe42944d255a0e7da026
commit ce0c4802c02c98fffd66fe42944d255a0e7da026
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 23 16:51:11 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 3 09:40:31 2013 -0400

    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:


hooks/post-receive
-- 
CMake