[Cmake-commits] CMake branch, master, updated. v3.0.2-1893-ge6f0bb7

[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  e6f0bb7b1577923b6252370a6c8dd2db202dece7 (commit)
       via  e3c97a1914aa0a521b55b53ab1b0d71732c5e466 (commit)
       via  b8877b1d62599bba7a014e95fbbd670f177243ce (commit)
      from  d8dde37d609fd0badfa4c9d13c927c2d2ed27902 (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=e6f0bb7b1577923b6252370a6c8dd2db202dece7
commit e6f0bb7b1577923b6252370a6c8dd2db202dece7
Merge: d8dde37 e3c97a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 22 09:13:01 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 22 09:13:01 2014 -0400

    Merge topic 'autogen-fixes'
    
    e3c97a19 QtAutogen: Process all ui files in a source file (#14981).
    b8877b1d QtAutogen: Add source files to target when only AUTORCC is used.

diff --cc Tests/QtAutogen/CMakeLists.txt
index 3973653,f1a272a..3fd00b8
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@@ -64,15 -67,10 +67,16 @@@ add_custom_command
    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/myotherinterface.h.in"
  )
  
 +message("CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
 +if (CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]" AND NOT CMAKE_CONFIGURATION_TYPES)
 +  set(debug_srcs "$<$<CONFIG:Debug>:debug_class.cpp>" $<$<CONFIG:Debug>:debug_resource.qrc>)
 +  add_definitions(-DTEST_DEBUG_CLASS)
 +endif()
 +
  add_executable(QtAutogen main.cpp calwidget.cpp second_widget.cpp foo.cpp blub.cpp bar.cpp abc.cpp
+                multiplewidgets.cpp
                 xyz.cpp yaf.cpp gadget.cpp $<TARGET_OBJECTS:privateSlot>
 -               test.qrc second_resource.qrc resourcetester.cpp generated.cpp
 +               test.qrc second_resource.qrc resourcetester.cpp generated.cpp ${debug_srcs}
  )
  set_property(TARGET QtAutogen APPEND PROPERTY AUTOGEN_TARGET_DEPENDS generate_moc_input "${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h")
  

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

Summary of changes:
 Source/cmQtAutoGenerators.cxx                    |   44 ++++++++++++----------
 Source/cmQtAutoGenerators.h                      |   24 ++++++------
 Tests/QtAutogen/CMakeLists.txt                   |    4 ++
 Tests/QtAutogen/multiplewidgets.cpp              |   19 ++++++++++
 Tests/QtAutogen/multiplewidgets.h                |   33 ++++++++++++++++
 Tests/QtAutogen/rcconly.cpp                      |    9 +++++
 Tests/QtAutogen/{debug_class.ui => widget1.ui}   |   28 +++++++-------
 Tests/QtAutogen/{second_widget.ui => widget2.ui} |   15 +++-----
 8 files changed, 122 insertions(+), 54 deletions(-)
 create mode 100644 Tests/QtAutogen/multiplewidgets.cpp
 create mode 100644 Tests/QtAutogen/multiplewidgets.h
 create mode 100644 Tests/QtAutogen/rcconly.cpp
 copy Tests/QtAutogen/{debug_class.ui => widget1.ui} (64%)
 copy Tests/QtAutogen/{second_widget.ui => widget2.ui} (61%)


hooks/post-receive
-- 
CMake