[Cmake-commits] CMake branch, master, updated. v3.11.1-790-g5a227ce
Kitware Robot
kwrobot at kitware.com
Mon May 14 09:45:04 EDT 2018
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 5a227ce805f06bf8a31cc3a47169bcf1f33bda1b (commit)
via 238c4820ff19a6a6be57a4d7a4fb7be794798c60 (commit)
via 6e39697ad5f1a268f67b9e5ec58f8e0b86ab6b0f (commit)
via 81ef418fe801970229f2c2a43e39b7dcef659e7c (commit)
via 05d67d2545e3b3f9659dc615c72cc20e6d4781b7 (commit)
via 55efd14733a8ad6bfeebcd661f85d312eeaa409d (commit)
via 72e9fcdf2fdb9b7fce8544028d30088db2735331 (commit)
via 05ece372a616dc83ffbe0e4a6d57bc57146b3054 (commit)
via a170a59a582ec4e5d65d2e66503a3838982b7de0 (commit)
from 18c71919ac16d82012d4ed2c240d592546bfc69c (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=5a227ce805f06bf8a31cc3a47169bcf1f33bda1b
commit 5a227ce805f06bf8a31cc3a47169bcf1f33bda1b
Merge: 238c482 a170a59
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 14 13:41:43 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon May 14 09:42:00 2018 -0400
Merge topic 'cuda-vs-cuda-device-runtime'
a170a59a58 VS: Link CUDA binaries with the device runtime library 'cudadevrt'
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2062
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=238c4820ff19a6a6be57a4d7a4fb7be794798c60
commit 238c4820ff19a6a6be57a4d7a4fb7be794798c60
Merge: 6e39697 72e9fcd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 14 09:39:36 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 14 09:39:36 2018 -0400
Merge branch 'release-3.11'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e39697ad5f1a268f67b9e5ec58f8e0b86ab6b0f
commit 6e39697ad5f1a268f67b9e5ec58f8e0b86ab6b0f
Merge: 81ef418 05ece37
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 14 13:35:12 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon May 14 09:35:34 2018 -0400
Merge topic 'irsl-fortran-only-linux'
05ece372a6 IRSL: Fix Intel library list for ifort-only setups
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2061
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81ef418fe801970229f2c2a43e39b7dcef659e7c
commit 81ef418fe801970229f2c2a43e39b7dcef659e7c
Merge: 18c7191 05d67d2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 14 13:34:49 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon May 14 09:35:00 2018 -0400
Merge topic 'update-kwsys'
05d67d2545 Merge branch 'upstream-KWSys' into update-kwsys
55efd14733 KWSys 2018-05-11 (46da6b14)
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2064
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05d67d2545e3b3f9659dc615c72cc20e6d4781b7
commit 05d67d2545e3b3f9659dc615c72cc20e6d4781b7
Merge: c9e995c 55efd14
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 11 11:34:27 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 11 11:34:27 2018 -0400
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-05-11 (46da6b14)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55efd14733a8ad6bfeebcd661f85d312eeaa409d
commit 55efd14733a8ad6bfeebcd661f85d312eeaa409d
Author: KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Fri May 11 07:21:50 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 11 11:34:26 2018 -0400
KWSys 2018-05-11 (46da6b14)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 46da6b14f03f27d8531f841b9f48c1fda452c915 (master).
Upstream Shortlog
-----------------
Kyle Edwards (2):
5b8bf75b INSTALL: move namelink into development component
e5733515 Fix recent regression in installation of namelink
luz.paz (1):
0e14a1a6 Misc. typos and whitespace fixes
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fc176b..96088c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,6 +196,11 @@ IF(KWSYS_STANDALONE)
ENDIF()
ENDIF()
+# Choose default shared/static build if not specified.
+IF(NOT DEFINED KWSYS_BUILD_SHARED)
+ SET(KWSYS_BUILD_SHARED ${BUILD_SHARED_LIBS})
+ENDIF()
+
# Include helper macros.
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/kwsysPlatformTests.cmake)
INCLUDE(CheckTypeSize)
@@ -230,13 +235,14 @@ ENDIF()
# Setup library install rules.
SET(KWSYS_INSTALL_LIBRARY_RULE)
+SET(KWSYS_INSTALL_NAMELINK_RULE)
IF(KWSYS_INSTALL_LIB_DIR)
IF(KWSYS_INSTALL_EXPORT_NAME)
LIST(APPEND KWSYS_INSTALL_LIBRARY_RULE EXPORT ${KWSYS_INSTALL_EXPORT_NAME})
ENDIF()
# Install the shared library to the lib directory.
SET(KWSYS_INSTALL_LIBRARY_RULE ${KWSYS_INSTALL_LIBRARY_RULE}
- LIBRARY DESTINATION ${KWSYS_INSTALL_LIB_DIR}
+ LIBRARY DESTINATION ${KWSYS_INSTALL_LIB_DIR} NAMELINK_SKIP
)
# Assign the shared library to the runtime component.
IF(KWSYS_INSTALL_COMPONENT_NAME_RUNTIME)
@@ -244,6 +250,17 @@ IF(KWSYS_INSTALL_LIB_DIR)
COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_RUNTIME}
)
ENDIF()
+ IF(KWSYS_BUILD_SHARED)
+ SET(KWSYS_INSTALL_NAMELINK_RULE ${KWSYS_INSTALL_NAMELINK_RULE}
+ LIBRARY DESTINATION ${KWSYS_INSTALL_LIB_DIR} NAMELINK_ONLY
+ )
+ # Assign the namelink to the development component.
+ IF(KWSYS_INSTALL_COMPONENT_NAME_DEVELOPMENT)
+ SET(KWSYS_INSTALL_NAMELINK_RULE ${KWSYS_INSTALL_NAMELINK_RULE}
+ COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_DEVELOPMENT}
+ )
+ ENDIF()
+ ENDIF()
# Install the archive to the lib directory.
SET(KWSYS_INSTALL_LIBRARY_RULE ${KWSYS_INSTALL_LIBRARY_RULE}
@@ -427,11 +444,6 @@ ELSE()
SET(KWSYS_NAME_IS_KWSYS 0)
ENDIF()
-# Choose default shared/static build if not specified.
-IF(KWSYS_BUILD_SHARED MATCHES "^KWSYS_BUILD_SHARED$")
- SET(KWSYS_BUILD_SHARED ${BUILD_SHARED_LIBS})
-ENDIF()
-
IF(KWSYS_BUILD_SHARED)
SET(KWSYS_BUILD_SHARED 1)
SET(KWSYS_LIBRARY_TYPE SHARED)
@@ -933,6 +945,9 @@ IF(KWSYS_C_SRCS OR KWSYS_CXX_SRCS)
IF(KWSYS_INSTALL_LIBRARY_RULE)
INSTALL(TARGETS ${KWSYS_TARGET_INSTALL} ${KWSYS_INSTALL_LIBRARY_RULE})
ENDIF()
+ IF(KWSYS_INSTALL_NAMELINK_RULE)
+ INSTALL(TARGETS ${KWSYS_TARGET_INSTALL} ${KWSYS_INSTALL_NAMELINK_RULE})
+ ENDIF()
ENDIF()
# Add a C-only library if requested.
diff --git a/RegularExpression.hxx.in b/RegularExpression.hxx.in
index 3cbbeb8..92e4b36 100644
--- a/RegularExpression.hxx.in
+++ b/RegularExpression.hxx.in
@@ -218,7 +218,7 @@ inline std::string RegularExpressionMatch::match(int n) const
* object as an argument and creates an object initialized with the
* information from the given RegularExpression object.
*
- * The find member function finds the first occurrence of the regular
+ * The find member function finds the first occurrence of the regular
* expression of that object in the string given to find as an argument. Find
* returns a boolean, and if true, mutates the private data appropriately.
* Find sets pointers to the beginning and end of the thing last found, they
@@ -230,9 +230,9 @@ inline std::string RegularExpressionMatch::match(int n) const
* the to see if the compiled regular expression is the same, and the
* deep_equal functions also checks to see if the start and end pointers are
* the same. The is_valid function returns false if program is set to NULL,
- * (i.e. there is no valid compiled exression). The set_invalid function sets
- * the program to NULL (Warning: this deletes the compiled expression). The
- * following examples may help clarify regular expression usage:
+ * (i.e. there is no valid compiled expression). The set_invalid function
+ * sets the program to NULL (Warning: this deletes the compiled expression).
+ * The following examples may help clarify regular expression usage:
*
* * The regular expression "^hello" matches a "hello" only at the
* beginning of a line. It would match "hello there" but not "hi,
@@ -270,13 +270,13 @@ inline std::string RegularExpressionMatch::match(int n) const
*
* * The regular expression "(..p)b" matches something ending with pb
* and beginning with whatever the two characters before the first p
- * encounterd in the line were. It would find "repb" in "rep drepa
+ * encountered in the line were. It would find "repb" in "rep drepa
* qrepb". The regular expression "(..p)a" would find "repa qrepb"
* in "rep drepa qrepb"
*
* * The regular expression "d(..p)" matches something ending with p,
* beginning with d, and having two characters in between that are
- * the same as the two characters before the first p encounterd in
+ * the same as the two characters before the first p encountered in
* the line. It would match "drepa qrepb" in "rep drepa qrepb".
*
* All methods of RegularExpression can be called simultaneously from
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 7426816..37dec13 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -1270,7 +1270,7 @@ public:
long GetLineNumber() const { return this->LineNumber; }
// Description:
- // Set the address where the biinary image is mapped
+ // Set the address where the binary image is mapped
// into memory.
void SetBinaryBaseAddress(void* address)
{
@@ -4061,7 +4061,7 @@ bool SystemInformationImplementation::QueryLinuxMemory()
if (linuxMajor >= 3 || ((linuxMajor >= 2) && (linuxMinor >= 6))) {
// new /proc/meminfo format since kernel 2.6.x
- // Rigorously, this test should check from the developping version 2.5.x
+ // Rigorously, this test should check from the developing version 2.5.x
// that introduced the new format...
enum
diff --git a/testCommandLineArguments.cxx b/testCommandLineArguments.cxx
index 78baed9..58f861c 100644
--- a/testCommandLineArguments.cxx
+++ b/testCommandLineArguments.cxx
@@ -136,7 +136,7 @@ int testCommandLineArguments(int argc, char* argv[])
arg.AddCallback("-C", argT::EQUAL_ARGUMENT, argument, random_ptr,
"Option -C takes argument after =");
arg.AddCallback("-D", argT::CONCAT_ARGUMENT, argument, random_ptr,
- "This option takes concatinated argument");
+ "This option takes concatenated argument");
arg.AddCallback("--long1", argT::NO_ARGUMENT, argument, random_ptr, "-A");
arg.AddCallback("--long2", argT::SPACE_ARGUMENT, argument, random_ptr, "-B");
arg.AddCallback("--long3", argT::EQUAL_ARGUMENT, argument, random_ptr,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a170a59a582ec4e5d65d2e66503a3838982b7de0
commit a170a59a582ec4e5d65d2e66503a3838982b7de0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 11 08:37:24 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 11 08:49:10 2018 -0400
VS: Link CUDA binaries with the device runtime library 'cudadevrt'
According to https://docs.nvidia.com/cuda/nvrtc/index.html there are
some cases where a CUDA binary "...must be linked against the CUDA
device runtime (cudadevrt) library". When `nvcc` drives linking it
automatically links to runtime libraries as follows:
* -cudart=none: None
* -cudart=shared: -lcudadevrt -lcudart
* -cudart=static: -lcudadevrt -lcudart_static
The `cudadevrt` library is the cuda device runtime library. It is
always static so passing it to the linker when not necessary does
not hurt anything.
With Ninja and Makefile generators, we detect `cudadevrt` and either
`cudart` or `cudart_static` libraries implied by `nvcc` and then add
them to link lines driven by a host compiler. However, this does not
work with the VS generator because the CUDA Toolkit Visual Studio
integration does not use `nvcc` to link binaries and instead uses
`link.exe` directly.
Visual Studio project files (`.vcxproj`) for CUDA are expected to
explicitly list the needed runtime libraries. Our VS generator already
adds `cudart.lib` or `cudart_static.lib` based on the `-cudart=` flag.
Update it to also add `cudadevrt.lib` as nvcc does.
Fixes: #17988
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index cfdf2d8..d90d754 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3298,9 +3298,11 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
"CUDA") != linkClosure->Languages.end()) {
switch (this->CudaOptions[config]->GetCudaRuntime()) {
case cmVisualStudioGeneratorOptions::CudaRuntimeStatic:
+ libVec.push_back("cudadevrt.lib");
libVec.push_back("cudart_static.lib");
break;
case cmVisualStudioGeneratorOptions::CudaRuntimeShared:
+ libVec.push_back("cudadevrt.lib");
libVec.push_back("cudart.lib");
break;
case cmVisualStudioGeneratorOptions::CudaRuntimeNone:
-----------------------------------------------------------------------
Summary of changes:
Modules/InstallRequiredSystemLibraries.cmake | 18 +++++++++--------
Source/cmVisualStudio10TargetGenerator.cxx | 2 ++
Source/kwsys/CMakeLists.txt | 27 ++++++++++++++++++++------
Source/kwsys/RegularExpression.hxx.in | 12 ++++++------
Source/kwsys/SystemInformation.cxx | 4 ++--
Source/kwsys/testCommandLineArguments.cxx | 2 +-
6 files changed, 42 insertions(+), 23 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list