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 16602e1cd2480e8406acc4233825469339f458f1 (commit)
via 704e1fa75ea8821b445fb10d5b17af565fd5a97f (commit)
from 6b92c3d6ca0353056c7d09faffa55c35759832f2 (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=16602e1cd2480e8406acc4233825469339f458f1
commit 16602e1cd2480e8406acc4233825469339f458f1
Merge: 6b92c3d 704e1fa
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Sep 9 09:11:13 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 9 09:11:13 2014 -0400
Merge topic 'if-sanity' into next
704e1fa7 Fix if() checks of CMAKE_SYSTEM_NAME on Cygwin
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=704e1fa75ea8821b445fb10d5b17af565fd5a97f
commit 704e1fa75ea8821b445fb10d5b17af565fd5a97f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Sep 9 09:09:57 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Sep 9 09:09:57 2014 -0400
Fix if() checks of CMAKE_SYSTEM_NAME on Cygwin
The CMAKE_SYSTEM_NAME is "CYGWIN", but we also define a variable
named "CYGWIN" to "1". Avoid allowing if() to expand the "CYGWIN"
string as a variable.
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index 66ec900..22ca8cf 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -50,7 +50,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
if(NOT DEFINED CPACK_SYSTEM_NAME)
# make sure package is not Cygwin-unknown, for Cygwin just
# cygwin is good for the system name
- if("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
+ if("x${CMAKE_SYSTEM_NAME}" STREQUAL "xCYGWIN")
set(CPACK_SYSTEM_NAME Cygwin)
else()
set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54aad83..14f60ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -381,7 +381,7 @@ macro (CMAKE_BUILD_UTILITIES)
# Use curses?
if (UNIX)
# there is a bug in the Syllable libraries which makes linking ccmake
fail, Alex
- if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES syllable)
+ if(NOT CMAKE_SYSTEM_NAME MATCHES syllable)
set(CURSES_NEED_NCURSES TRUE)
find_package(Curses QUIET)
if (CURSES_LIBRARY)
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index c3f77f4..f9405b3 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -451,7 +451,7 @@ if (WIN32)
endif ()
# Watcom support
-if(WIN32 OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
set_property(SOURCE cmake.cxx APPEND PROPERTY COMPILE_DEFINITIONS
CMAKE_USE_WMAKE)
list(APPEND SRCS
cmGlobalWatcomWMakeGenerator.cxx
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7242a00..128498c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1392,7 +1392,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Dependency")
- if("${CMAKE_SYSTEM_NAME}" MATCHES syllable)
+ if(CMAKE_SYSTEM_NAME MATCHES syllable)
# RPATH isn't supported under Syllable, so the tests don't
# find their libraries. In order to fix that LIBRARY_OUTPUT_DIR
-----------------------------------------------------------------------
Summary of changes:
CMakeCPack.cmake | 2 +-
CMakeLists.txt | 2 +-
Source/CMakeLists.txt | 2 +-
Tests/CMakeLists.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
