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 73f8e7f06aeac0740769d7350bf23b9b418258a0 (commit)
via de294e6007f2eb086c63c31c2da6ba08d1fdf60f (commit)
from b5d5a543490faf62bf52bbad53cba3c8b33f051c (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=73f8e7f06aeac0740769d7350bf23b9b418258a0
commit 73f8e7f06aeac0740769d7350bf23b9b418258a0
Merge: b5d5a54 de294e6
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Dec 5 12:23:47 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Dec 5 12:23:47 2013 -0500
Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next
de294e6 Try to fix the test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de294e6007f2eb086c63c31c2da6ba08d1fdf60f
commit de294e6007f2eb086c63c31c2da6ba08d1fdf60f
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Dec 5 18:23:03 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Dec 5 18:23:03 2013 +0100
Try to fix the test.
diff --git a/Tests/RunCMake/CompatibleInterface/RunCMakeTest.cmake
b/Tests/RunCMake/CompatibleInterface/RunCMakeTest.cmake
index 7a55c10..b87adc8 100644
--- a/Tests/RunCMake/CompatibleInterface/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompatibleInterface/RunCMakeTest.cmake
@@ -11,6 +11,7 @@ run_cmake(InterfaceString-builtin-prop)
run_cmake(InterfaceString-Bool-Conflict)
run_cmake(DebugProperties)
-set(RunCMake_TEST_OPTIONS
-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
-
-run_cmake(AutoUic)
+if (QT_QMAKE_EXECUTABLE})
+ set(RunCMake_TEST_OPTIONS
-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
+ run_cmake(AutoUic)
+endif()
-----------------------------------------------------------------------
Summary of changes:
.../CompatibleInterface/RunCMakeTest.cmake | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
