[Cmake-commits] CMake branch, master, updated. v2.8.11-122-g80f30aa

[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, master has been updated
       via  80f30aa6bf76c795631f576a25295f59b077afef (commit)
       via  6489015c75367493c9ea6a7bea69b67a88972651 (commit)
       via  e7813b15a63a4ff5150d22b01ef47b51b22045e5 (commit)
       via  27fb96b9783ba13ce4c8bd681b73c6f3a892d90c (commit)
      from  f206cce2cac8b018d94b2c4f39b35c6928d38bd3 (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=80f30aa6bf76c795631f576a25295f59b077afef
commit 80f30aa6bf76c795631f576a25295f59b077afef
Merge: f206cce 6489015
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 21 15:12:35 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 21 15:12:35 2013 -0400

    Merge topic 'Automoc-Qt4-Qt5'
    
    6489015 Remove an endif() followed by an if() for the same condition.
    e7813b1 Add a test for Qt5Automoc
    27fb96b Make the QtAutomoc test compile with either Qt 4 or Qt 5

diff --cc Tests/QtAutomoc/Adir/CMakeLists.txt
index 1712223,ebfdb5d..a1c36ff
--- a/Tests/QtAutomoc/Adir/CMakeLists.txt
+++ b/Tests/QtAutomoc/Adir/CMakeLists.txt
@@@ -1,8 -1,8 +1,8 @@@
  
  set(CMAKE_INCLUDE_CURRENT_DIR ON)
  set(CMAKE_AUTOMOC ON)
 -set(CMAKE_BUILD_INTERFACE_INCLUDES ON)
 +set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
  
  add_library(libA SHARED libA.cpp)
- target_link_libraries(libA LINK_PUBLIC Qt4::QtCore)
+ target_link_libraries(libA LINK_PUBLIC ${QT_QTCORE_TARGET})
  generate_export_header(libA)

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

Summary of changes:
 Tests/CMakeLists.txt                |   26 ++++++++++++++++++++------
 Tests/QtAutomoc/Adir/CMakeLists.txt |    2 +-
 Tests/QtAutomoc/CMakeLists.txt      |   23 +++++++++++++++++++++--
 Tests/QtAutomoc/calwidget.cpp       |   17 ++++++++++++-----
 Tests/QtAutomoc/main.cpp            |    2 +-
 5 files changed, 55 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake