[Cmake-commits] CMake branch, master, updated. v3.9.0-rc2-78-g6733d60
Kitware Robot
kwrobot at kitware.com
Tue Jun 13 09:25:05 EDT 2017
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, master has been updated
via 6733d602afec0218feeddea93b043cf36aa22e4a (commit)
via 5f704d992da3d8adb33481ec4cbec4ce49234add (commit)
via 087b8ccda98af32480657d2e54b5395aac3b413f (commit)
via 7368ade2502a347b18c47fc175b67c1d0f594744 (commit)
via 70a6cb70f644b23acb99f1f6342728c8afb23d14 (commit)
via 6610fdbed2c8e375055a304daa41ee6301317c34 (commit)
via ae77d9768f27a652ecc823c7333e0306bbccc50a (commit)
from 4ba2d2e3d76cb1ec04c612f9646c47d3f1231ad2 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6733d602afec0218feeddea93b043cf36aa22e4a
commit 6733d602afec0218feeddea93b043cf36aa22e4a
Merge: 5f704d9 ae77d97
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 13 13:20:50 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jun 13 09:20:54 2017 -0400
Merge topic 'remove-stray-line'
ae77d976 cmGlobalGenerator: Remove unused line
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !955
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f704d992da3d8adb33481ec4cbec4ce49234add
commit 5f704d992da3d8adb33481ec4cbec4ce49234add
Merge: 087b8cc 70a6cb7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 13 13:20:31 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jun 13 09:20:34 2017 -0400
Merge topic 'doc-pkgconfig-list'
70a6cb70 FindPkgConfig: mention that variables will be ;-lists
6610fdbe FindPkgConfig: fix confusing indentation
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !957
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=087b8ccda98af32480657d2e54b5395aac3b413f
commit 087b8ccda98af32480657d2e54b5395aac3b413f
Merge: 4ba2d2e 7368ade
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 13 13:18:13 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jun 13 09:18:19 2017 -0400
Merge topic 'cuda-dlink-no-deprecated-gpu'
7368ade2 CUDA: When linking device code suppress CUDA 8.0+ deprecation warnings
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !951
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7368ade2502a347b18c47fc175b67c1d0f594744
commit 7368ade2502a347b18c47fc175b67c1d0f594744
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Fri Jun 9 15:49:58 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 13 09:15:19 2017 -0400
CUDA: When linking device code suppress CUDA 8.0+ deprecation warnings
The CUDA compiler automatic deprecation warnings are pure noise when
doing device linking, and should be suppressed to reduce the amount of
confusion from users.
diff --git a/Modules/CMakeCUDAInformation.cmake b/Modules/CMakeCUDAInformation.cmake
index 1c48159..780e953 100644
--- a/Modules/CMakeCUDAInformation.cmake
+++ b/Modules/CMakeCUDAInformation.cmake
@@ -186,16 +186,25 @@ if(NOT CMAKE_CUDA_LINK_EXECUTABLE)
"<CMAKE_CUDA_HOST_LINK_LAUNCHER> <CMAKE_CUDA_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>${__IMPLICT_LINKS}")
endif()
+if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0")
+ set(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS "-Wno-deprecated-gpu-targets")
+else()
+ set(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS "")
+endif()
+
+
#These are used when linking relocatable (dc) cuda code
if(NOT CMAKE_CUDA_DEVICE_LINK_LIBRARY)
set(CMAKE_CUDA_DEVICE_LINK_LIBRARY
- "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+ "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
endif()
if(NOT CMAKE_CUDA_DEVICE_LINK_EXECUTABLE)
set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
- "<CMAKE_CUDA_COMPILER> <FLAGS> <CMAKE_CUDA_LINK_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+ "<CMAKE_CUDA_COMPILER> <FLAGS> <CMAKE_CUDA_LINK_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
endif()
+unset(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS)
+
mark_as_advanced(
CMAKE_CUDA_FLAGS
CMAKE_CUDA_FLAGS_RELEASE
diff --git a/Modules/Platform/Windows-NVIDIA-CUDA.cmake b/Modules/Platform/Windows-NVIDIA-CUDA.cmake
index 845fa4b..970c2c6 100644
--- a/Modules/Platform/Windows-NVIDIA-CUDA.cmake
+++ b/Modules/Platform/Windows-NVIDIA-CUDA.cmake
@@ -30,10 +30,18 @@ set(CMAKE_CUDA_LINK_EXECUTABLE
unset(_CMAKE_VS_LINK_EXE)
unset(_CMAKE_VS_LINK_EXE)
+if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0")
+ set(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS "-Wno-deprecated-gpu-targets")
+else()
+ set(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS "")
+endif()
+
set(CMAKE_CUDA_DEVICE_LINK_LIBRARY
- "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+ "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
- "<CMAKE_CUDA_COMPILER> <FLAGS> <CMAKE_CUDA_LINK_FLAGS> -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+ "<CMAKE_CUDA_COMPILER> <FLAGS> <CMAKE_CUDA_LINK_FLAGS> ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+
+unset(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS)
string(REPLACE "/D" "-D" _PLATFORM_DEFINES_CUDA "${_PLATFORM_DEFINES}${_PLATFORM_DEFINES_CXX}")
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 46c2894..29a06b7 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2591,6 +2591,13 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaLinkOptions(
cudaLinkOptions.AddFlag("PerformDeviceLink",
doDeviceLinking ? "true" : "false");
+ // Suppress deprecation warnings for default GPU targets during device link.
+ if (cmSystemTools::VersionCompareGreaterEq(
+ this->GlobalGenerator->GetPlatformToolsetCudaString(), "8.0")) {
+ cudaLinkOptions.AppendFlag("AdditionalOptions",
+ "-Wno-deprecated-gpu-targets");
+ }
+
this->CudaLinkOptions[configName] = pOptions.release();
return true;
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70a6cb70f644b23acb99f1f6342728c8afb23d14
commit 70a6cb70f644b23acb99f1f6342728c8afb23d14
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jun 12 22:02:50 2017 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jun 12 22:03:20 2017 +0200
FindPkgConfig: mention that variables will be ;-lists
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index eb95227..a5357fa 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -86,6 +86,9 @@ endmacro()
pkg_get_variable(<RESULT> <MODULE> <VARIABLE>)
+ If multiple values are returned variable will contain a
+ :ref:`;-list <CMake Language Lists>`.
+
For example:
.. code-block:: cmake
@@ -524,6 +527,9 @@ endmacro()
<XPREFIX> = <PREFIX> for common case
<XPREFIX> = <PREFIX>_STATIC for static linking
+ Every variable containing multiple values will be a
+ :ref:`;-list <CMake Language Lists>`.
+
There are some special variables whose prefix depends on the count of
given modules. When there is only one module, <PREFIX> stays
unchanged. When there are multiple modules, the prefix will be
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6610fdbed2c8e375055a304daa41ee6301317c34
commit 6610fdbed2c8e375055a304daa41ee6301317c34
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jun 12 21:54:03 2017 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jun 12 22:03:20 2017 +0200
FindPkgConfig: fix confusing indentation
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 12a5ded..eb95227 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -65,7 +65,7 @@ macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
set(_pkgconfig_${_varname} "")
_pkgconfig_unset(${_prefix}_${_varname})
else()
- string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+ string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
if (NOT ${_regexp} STREQUAL "")
string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae77d9768f27a652ecc823c7333e0306bbccc50a
commit ae77d9768f27a652ecc823c7333e0306bbccc50a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 12 10:01:31 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 12 10:01:31 2017 -0400
cmGlobalGenerator: Remove unused line
Remove an unused line that was left by commit v2.4.0~3946 (set
CMAKE_SYSTEM_VERSION for windows, 2003-07-16).
Fixes: #16956
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 591963f..0bef710 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -490,7 +490,6 @@ void cmGlobalGenerator::EnableLanguage(
windowsVersionString << osviex.dwMajorVersion << "."
<< osviex.dwMinorVersion << "."
<< osviex.dwBuildNumber;
- windowsVersionString.str();
mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION",
windowsVersionString.str().c_str());
#endif
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCUDAInformation.cmake | 13 +++++++++++--
Modules/FindPkgConfig.cmake | 8 +++++++-
Modules/Platform/Windows-NVIDIA-CUDA.cmake | 12 ++++++++++--
Source/cmGlobalGenerator.cxx | 1 -
Source/cmVisualStudio10TargetGenerator.cxx | 7 +++++++
5 files changed, 35 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list