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 0fbb08b228c1ce0cef6d4c6332d0dbcde87b03f4 (commit)
via 305c206900d7ada953e2b8de7709733f5c46cdf9 (commit)
from 0c47c2f90796aab40911b3595870801bae6ba7d7 (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=0fbb08b228c1ce0cef6d4c6332d0dbcde87b03f4
commit 0fbb08b228c1ce0cef6d4c6332d0dbcde87b03f4
Merge: 0c47c2f 305c206
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Aug 5 09:02:20 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Aug 5 09:02:20 2014 -0400
Merge topic 'qt-automoc' into next
305c2069 Qt: Restore Qt4AndQt5Automoc test behavior.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=305c206900d7ada953e2b8de7709733f5c46cdf9
commit 305c206900d7ada953e2b8de7709733f5c46cdf9
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Aug 5 07:00:07 2014 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Tue Aug 5 07:00:07 2014 -0600
Qt: Restore Qt4AndQt5Automoc test behavior.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1402c95..ca7fcdc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1201,10 +1201,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Targets")
- endif()
-
- if((QT4_WORKS AND QT_QTGUI_FOUND) OR
- (Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0) )
+ if(Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0)
add_test(Qt4And5Automoc ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Qt4And5Automoc"
@@ -1229,6 +1226,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
--test-command ${CMAKE_CTEST_COMMAND} -V
)
list(APPEND TEST_BUILD_DIRS
"${CMake_BINARY_DIR}/Tests/Qt4And5AutomocReverse")
+ endif()
endif()
find_package(GTK2 QUIET)
diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt
b/Tests/Qt4And5Automoc/CMakeLists.txt
index 7f3e81e..34c8115 100644
--- a/Tests/Qt4And5Automoc/CMakeLists.txt
+++ b/Tests/Qt4And5Automoc/CMakeLists.txt
@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 3.0.1)
project(Qt4And5Automoc)
if (QT_REVERSE_FIND_ORDER)
- find_package(Qt5Core)
- find_package(Qt4)
+ find_package(Qt5Core REQUIRED)
+ find_package(Qt4 REQUIRED)
else()
- find_package(Qt4)
- find_package(Qt5Core)
+ find_package(Qt4 REQUIRED)
+ find_package(Qt5Core REQUIRED)
endif()
set(CMAKE_AUTOMOC ON)
@@ -22,14 +22,10 @@ endmacro()
include_directories(include)
-if (${QT4_FOUND})
generate_main_file(4)
add_executable(qt4_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt4.cpp" AnObject.cpp
src/OtherObject.cpp)
target_link_libraries(qt4_exe Qt4::QtCore)
-endif()
-if (${QT5_FOUND})
generate_main_file(5)
add_executable(qt5_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt5.cpp" AnObject.cpp
src/OtherObject.cpp)
target_link_libraries(qt5_exe Qt5::Core)
-endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 6 ++----
Tests/Qt4And5Automoc/CMakeLists.txt | 12 ++++--------
2 files changed, 6 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
