[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3065-g1d7d919
Stephen Kelly
steveire at gmail.com
Sat Jul 13 05:12:59 EDT 2013
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 1d7d9194701ddfa2e60c4c8229a6d01b7b02fd45 (commit)
via 20107199c4a2916cde1787f9fbdf4fc17867156d (commit)
from b6a75075a5e08a70e016ed8e54bbdf1bcdad0d31 (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=1d7d9194701ddfa2e60c4c8229a6d01b7b02fd45
commit 1d7d9194701ddfa2e60c4c8229a6d01b7b02fd45
Merge: b6a7507 2010719
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 13 05:12:58 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jul 13 05:12:58 2013 -0400
Merge topic 'obsolete-qt4-macros' into next
2010719 Remove explicit CXX argument from project() command.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20107199c4a2916cde1787f9fbdf4fc17867156d
commit 20107199c4a2916cde1787f9fbdf4fc17867156d
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 13 11:12:08 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 13 11:12:08 2013 +0200
Remove explicit CXX argument from project() command.
diff --git a/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN.cmake b/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN.cmake
index 6f6f3ca..c0c64a5 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN.cmake
+++ b/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN.cmake
@@ -1,6 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
-
find_package(Qt4 REQUIRED)
set(CMAKE_WARN_DEPRECATED 1)
diff --git a/Tests/RunCMake/ObsoleteQtMacros/CMakeLists.txt b/Tests/RunCMake/ObsoleteQtMacros/CMakeLists.txt
index 68dd8d6..65ac8e8 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/CMakeLists.txt
+++ b/Tests/RunCMake/ObsoleteQtMacros/CMakeLists.txt
@@ -1,3 +1,3 @@
-cmake_minimum_required(VERSION 2.8)
-project(${RunCMake_TEST} CXX)
+cmake_minimum_required(VERSION 2.8.11)
+project(${RunCMake_TEST})
include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN.cmake b/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN.cmake
index 4c18aa3..e86a372 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN.cmake
+++ b/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN.cmake
@@ -1,6 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
-
find_package(Qt4 REQUIRED)
set(CMAKE_WARN_DEPRECATED 1)
-----------------------------------------------------------------------
Summary of changes:
.../ObsoleteQtMacros/AutomocMacro-WARN.cmake | 2 --
Tests/RunCMake/ObsoleteQtMacros/CMakeLists.txt | 4 ++--
.../ObsoleteQtMacros/UseModulesMacro-WARN.cmake | 2 --
3 files changed, 2 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list