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 f49799e996088f1bab6828be8df5ad818f45762e (commit)
via e475c067c5f738d46cd28ce1a0cf03f7404590d8 (commit)
via 7bc84502513febf4e5e974f3d4285baa53f0afb9 (commit)
from 2fbe31fab2ec28c42c9bee918653f3501500aca8 (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=f49799e996088f1bab6828be8df5ad818f45762e
commit f49799e996088f1bab6828be8df5ad818f45762e
Merge: 2fbe31f e475c06
Author: Daniele E. Domenichelli <daniele.domeniche...@gmail.com>
AuthorDate: Tue Jul 15 09:14:12 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jul 15 09:14:12 2014 -0400
Merge topic 'fix_Xcode_generator_name' into next
e475c067 Fix Xcode generator name
7bc84502 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e475c067c5f738d46cd28ce1a0cf03f7404590d8
commit e475c067c5f738d46cd28ce1a0cf03f7404590d8
Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
AuthorDate: Tue Jul 15 10:45:53 2014 +0200
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Tue Jul 15 10:46:34 2014 +0200
Fix Xcode generator name
The generator name is "Xcode", not "XCode"
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index dc4f894..d25986b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -77,7 +77,7 @@ if(BUILD_TESTING)
# some old versions of make simply cannot handle spaces in paths
if (MAKE_IS_GNU OR
CMAKE_MAKE_PROGRAM MATCHES "nmake|gmake|wmake" OR
- CMAKE_GENERATOR MATCHES "Visual Studio|XCode|Borland")
+ CMAKE_GENERATOR MATCHES "Visual Studio|Xcode|Borland")
set(MAKE_SUPPORTS_SPACES 1)
else()
set(MAKE_SUPPORTS_SPACES 0)
diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index f74d17e..145d312 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -1,7 +1,7 @@
include(RunCMake)
run_cmake(CommandConflict)
-if("${RunCMake_GENERATOR}" MATCHES "Visual Studio" OR "${RunCMake_GENERATOR}"
MATCHES "XCode" )
+if("${RunCMake_GENERATOR}" MATCHES "Visual Studio" OR "${RunCMake_GENERATOR}"
MATCHES "Xcode" )
run_cmake(OutputConflict)
endif()
run_cmake(EmptyCondition1)
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Tests/CMakeLists.txt | 2 +-
Tests/RunCMake/File_Generate/RunCMakeTest.cmake | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
