[Cmake-commits] CMake branch, next, updated. v3.1.0-1756-gfbe01e7

[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  fbe01e78c7cca2d62f001687b3bf753e957557be (commit)
       via  9a673737163a3474c83c8100c57454318344ef1c (commit)
      from  1ed4ba2ffb51eeeecfc2696136c2372b9a265577 (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=fbe01e78c7cca2d62f001687b3bf753e957557be
commit fbe01e78c7cca2d62f001687b3bf753e957557be
Merge: 1ed4ba2 9a67373
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 11 19:42:01 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 11 19:42:01 2015 -0500

    Merge topic 'autouic-regression-test' into next
    
    9a673737 QtAutoUic: Add a test for the regression in the parent commit.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a673737163a3474c83c8100c57454318344ef1c
commit 9a673737163a3474c83c8100c57454318344ef1c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 01:22:11 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jan 12 01:41:27 2015 +0100

    QtAutoUic: Add a test for the regression in the parent commit.

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 3fd00b8..de4d0d2 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -73,6 +73,12 @@ if (CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]" AND NOT CMAKE_CONFIGURATION_
   add_definitions(-DTEST_DEBUG_CLASS)
 endif()
 
+# The -no-protection option disables the generation of include guards.  Verify
+# that setting the source file property has an effect by using this and
+# issue an error in the preprocessor in calwidget.cpp if the include guard
+# is defined.
+set_source_files_properties(calwidget.ui PROPERTIES AUTOUIC_OPTIONS "-no-protection")
+
 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>
diff --git a/Tests/QtAutogen/calwidget.cpp b/Tests/QtAutogen/calwidget.cpp
index defde20..5f59994 100644
--- a/Tests/QtAutogen/calwidget.cpp
+++ b/Tests/QtAutogen/calwidget.cpp
@@ -50,6 +50,9 @@
  #include "calwidget.h"
 
  #include "ui_calwidget.h"
+ #ifdef UI_CALWIDGET_H
+ #error Definition of UI_CALWIDGET_H should be disabled by file option.
+ #endif
 
  Window::Window()
   : ui(new Ui::Window)

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

Summary of changes:
 Tests/QtAutogen/CMakeLists.txt |    6 ++++++
 Tests/QtAutogen/calwidget.cpp  |    3 +++
 2 files changed, 9 insertions(+)


hooks/post-receive
-- 
CMake