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 da8aa48b29761f697f23995b31eeb3d6179b11c3 (commit)
via 84e3fde94db9dfa2f3fb10a85c5db6c9a78124ab (commit)
via 17a457dcb02e351efe5d1dd093c9443ba206667a (commit)
via efd16ba928476bc1a576efc16d666661d31f0f49 (commit)
via e6a7abd2b69b45933abb5617a8bf5b800b2dde6f (commit)
via be5215c4ba85942a22143894048a4f160b65a87a (commit)
via 6bd776eba6221d9ef68b63d1c17a988145f31fc1 (commit)
from 140be4fd07c907c814ea0161db3c593463b53d74 (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=da8aa48b29761f697f23995b31eeb3d6179b11c3
commit da8aa48b29761f697f23995b31eeb3d6179b11c3
Merge: 140be4f 84e3fde
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Sep 24 10:11:39 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Sep 24 10:11:39 2014 -0400
Merge topic 'FindCUDA-cleanup-CMP0054' into next
84e3fde9 FindCUDA: Avoid if() auto-dereference in string comparisons
17a457dc Merge topic 'fix_search_path_ios_trycompile'
efd16ba9 Merge topic 'vs-wince-exe-entry-point'
e6a7abd2 Merge topic 'fix-LOCATION-slashes'
be5215c4 Merge topic 'ninja-compiler-change'
6bd776eb CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84e3fde94db9dfa2f3fb10a85c5db6c9a78124ab
commit 84e3fde94db9dfa2f3fb10a85c5db6c9a78124ab
Author: Adam Strzelecki <o...@java.pl>
AuthorDate: Wed Sep 17 13:54:29 2014 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Sep 24 10:10:42 2014 -0400
FindCUDA: Avoid if() auto-dereference in string comparisons
This silences possible CMP0054 warnings.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 9348aa5..2e2b21c 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -894,15 +894,15 @@ macro(CUDA_GET_SOURCES_AND_OPTIONS _sources
_cmake_options _options)
set( ${_options} )
set( _found_options FALSE )
foreach(arg ${ARGN})
- if(arg STREQUAL "OPTIONS")
+ if("x${arg}" STREQUAL "xOPTIONS")
set( _found_options TRUE )
elseif(
- arg STREQUAL "WIN32" OR
- arg STREQUAL "MACOSX_BUNDLE" OR
- arg STREQUAL "EXCLUDE_FROM_ALL" OR
- arg STREQUAL "STATIC" OR
- arg STREQUAL "SHARED" OR
- arg STREQUAL "MODULE"
+ "x${arg}" STREQUAL "xWIN32" OR
+ "x${arg}" STREQUAL "xMACOSX_BUNDLE" OR
+ "x${arg}" STREQUAL "xEXCLUDE_FROM_ALL" OR
+ "x${arg}" STREQUAL "xSTATIC" OR
+ "x${arg}" STREQUAL "xSHARED" OR
+ "x${arg}" STREQUAL "xMODULE"
)
list(APPEND ${_cmake_options} ${arg})
else()
diff --git a/Modules/FindCUDA/run_nvcc.cmake b/Modules/FindCUDA/run_nvcc.cmake
index 58e0d31..abdd307 100644
--- a/Modules/FindCUDA/run_nvcc.cmake
+++ b/Modules/FindCUDA/run_nvcc.cmake
@@ -126,7 +126,7 @@ endif()
# and other return variables are present after executing the process.
macro(cuda_execute_process status command)
set(_command ${command})
- if(NOT _command STREQUAL "COMMAND")
+ if(NOT "x${_command}" STREQUAL "xCOMMAND")
message(FATAL_ERROR "Malformed call to cuda_execute_process. Missing
COMMAND as second argument. (command = ${command})")
endif()
if(verbose)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindCUDA.cmake | 14 +++++++-------
Modules/FindCUDA/run_nvcc.cmake | 2 +-
Source/CMakeVersion.cmake | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
