[Cmake-commits] CMake branch, next, updated. v2.8.12-3718-ge14ebc0
Brad King
brad.king at kitware.com
Tue Oct 8 14:23:17 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 e14ebc0876bda8f3e625699cd262ee7d86a5a12e (commit)
via 7f459a664cdb74693af2e0ec4cfd3d1c46b21b76 (commit)
from 1e1e272d3aac3262d49d045678f7fb1ecfa54ec1 (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=e14ebc0876bda8f3e625699cd262ee7d86a5a12e
commit e14ebc0876bda8f3e625699cd262ee7d86a5a12e
Merge: 1e1e272 7f459a6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 8 14:23:13 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 8 14:23:13 2013 -0400
Merge topic 'xcode-5-no-BuildDepends-help' into next
7f459a6 Xcode: Teach BuildDepends test that Xcode >= 5 needs no help
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f459a664cdb74693af2e0ec4cfd3d1c46b21b76
commit 7f459a664cdb74693af2e0ec4cfd3d1c46b21b76
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 8 14:21:25 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 8 14:21:25 2013 -0400
Xcode: Teach BuildDepends test that Xcode >= 5 needs no help
Drop the HELP_XCODE workarounds needed on older Xcode versions when
using Xcode >= 5. We now expect builds and rebuilds to work using
proper dependencies with no special help.
diff --git a/Tests/BuildDepends/CMakeLists.txt b/Tests/BuildDepends/CMakeLists.txt
index 0687154..9727930 100644
--- a/Tests/BuildDepends/CMakeLists.txt
+++ b/Tests/BuildDepends/CMakeLists.txt
@@ -13,7 +13,7 @@ project(BuildDepends)
set(CMAKE_SUPPRESS_REGENERATION 1)
# Xcode needs some help with the fancy dependencies in this test.
-if("${CMAKE_GENERATOR}" MATCHES "Xcode")
+if(XCODE AND XCODE_VERSION VERSION_LESS 5)
set(HELP_XCODE 1)
endif()
function(help_xcode_depends)
-----------------------------------------------------------------------
Summary of changes:
Tests/BuildDepends/CMakeLists.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list