[Cmake-commits] CMake branch, next, updated. v2.8.12-3919-g5d4128f

[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  5d4128ff8fbc37e2870cff648a4cd9079df33c91 (commit)
       via  e5b231f5ed37ce8d531c50991725ec46e748896d (commit)
      from  975e88a1d2bdd6cf85b03cd34ea0024c1fa37656 (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=5d4128ff8fbc37e2870cff648a4cd9079df33c91
commit 5d4128ff8fbc37e2870cff648a4cd9079df33c91
Merge: 975e88a e5b231f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 12 04:37:30 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 12 04:37:30 2013 -0400

    Merge topic 'Qt-auto-generators' into next
    
    e5b231f Remove extra quoting.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5b231f5ed37ce8d531c50991725ec46e748896d
commit e5b231f5ed37ce8d531c50991725ec46e748896d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 12 10:36:50 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 12 10:36:50 2013 +0200

    Remove extra quoting.

diff --git a/Modules/AutogenInfo.cmake.in b/Modules/AutogenInfo.cmake.in
index d56fb02..8e38d86 100644
--- a/Modules/AutogenInfo.cmake.in
+++ b/Modules/AutogenInfo.cmake.in
@@ -17,7 +17,7 @@ set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/")
 set(AM_QT_VERSION_MAJOR "@_target_qt_version@")
 set(AM_TARGET_NAME @_moc_target_name@)
 set(AM_RELAXED_MODE "@_moc_relaxed_mode@")
-set(AM_UIC_OPTIONS_FILES "@_qt_uic_options_files@")
-set(AM_UIC_OPTIONS_OPTIONS "@_qt_uic_options_options@")
-set(AM_RCC_OPTIONS_FILES "@_qt_rcc_options_files@")
-set(AM_RCC_OPTIONS_OPTIONS "@_qt_rcc_options_options@")
+set(AM_UIC_OPTIONS_FILES @_qt_uic_options_files@)
+set(AM_UIC_OPTIONS_OPTIONS @_qt_uic_options_options@)
+set(AM_RCC_OPTIONS_FILES @_qt_rcc_options_files@)
+set(AM_RCC_OPTIONS_OPTIONS @_qt_rcc_options_options@)

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

Summary of changes:
 Modules/AutogenInfo.cmake.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake