[Cmake-commits] CMake branch, master, updated. v3.13.0-rc1-238-g8cabaaf
Kitware Robot
kwrobot at kitware.com
Thu Oct 25 07:35:08 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 8cabaaf054a16ea9c8332ce8e9291bd026b38c62 (commit)
via e178bd46cbf2ddaf2e4d0e913986d4ff2320e22c (commit)
via f56fdf5736501a9ad2a06b2d4f923666edb20592 (commit)
via 45c2406ba827dfb22b3dba671dca50876c615fda (commit)
via 69275d3b6a9787268f7bd80bb24d8e4cbb18710e (commit)
via 1c31eae65982c84d570217dd1493eb1d2ba6ee45 (commit)
via 89ab893469576e3cd164019b80bc96daee2ce9b1 (commit)
via 9f7b60969009c643dfa411b5f786b855078a6541 (commit)
via a834bcaa9100f552b7f40e2f439fe3afc972e2f1 (commit)
via d81c4db489d773e4a1ce6be49eb9c41582e68ae3 (commit)
via 5d481919d499f6de1dd079bf732f32ec3f085101 (commit)
via cf863b2e4ee2fbc44fde6d14cfac1b7733a09b07 (commit)
via 95c8a03f00f7e29e1d50b9db8885f487fbd0845d (commit)
via d17755f9cf583387fab83ad5744b93c746aa5994 (commit)
via 2cc050b53b4afb1ed62621360b860e25b7c46015 (commit)
via 83c13ca44f661ba22acf4abe63d84fd5651b4dbc (commit)
via cf92fd9ae9a50491e0e5a24d127b82dbda211a25 (commit)
via e768d96c74579c79e184027775e51b08cd77fe45 (commit)
from 60264705b945f9b1f91c58a52c2974c1399a97b0 (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=8cabaaf054a16ea9c8332ce8e9291bd026b38c62
commit 8cabaaf054a16ea9c8332ce8e9291bd026b38c62
Merge: f56fdf5 e178bd4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 25 11:34:31 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 25 07:34:35 2018 -0400
Merge topic 'cmake-gui-vs-open-space'
e178bd46cb cmake-gui: Fix "Open Project" for VS IDE with space in path
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2524
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e178bd46cbf2ddaf2e4d0e913986d4ff2320e22c
commit e178bd46cbf2ddaf2e4d0e913986d4ff2320e22c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 25 07:19:02 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 25 07:32:26 2018 -0400
cmake-gui: Fix "Open Project" for VS IDE with space in path
Do not encode the path for a shell until after we check that it exists.
Fixes: #18501
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 4aa52c3..da3daf8 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -878,12 +878,13 @@ bool cmGlobalVisualStudioGenerator::Open(const std::string& bindir,
const std::string& projectName,
bool dryRun)
{
- std::string buildDir = cmSystemTools::ConvertToOutputPath(bindir);
- std::string sln = buildDir + "\\" + projectName + ".sln";
+ std::string sln = bindir + "/" + projectName + ".sln";
if (dryRun) {
return cmSystemTools::FileExists(sln, true);
}
+ sln = cmSystemTools::ConvertToOutputPath(sln);
+
return std::async(std::launch::async, OpenSolution, sln).get();
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f56fdf5736501a9ad2a06b2d4f923666edb20592
commit f56fdf5736501a9ad2a06b2d4f923666edb20592
Merge: 45c2406 9f7b609
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 25 07:28:41 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 25 07:28:41 2018 -0400
Merge branch 'release-3.13'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45c2406ba827dfb22b3dba671dca50876c615fda
commit 45c2406ba827dfb22b3dba671dca50876c615fda
Merge: 69275d3 cf863b2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 25 07:27:07 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 25 07:27:07 2018 -0400
Merge branch 'release-3.12'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69275d3b6a9787268f7bd80bb24d8e4cbb18710e
commit 69275d3b6a9787268f7bd80bb24d8e4cbb18710e
Merge: 1c31eae 2cc050b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 25 11:25:43 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 25 07:26:24 2018 -0400
Merge topic 'cuda-thread-flags'
2cc050b53b CUDA: Add test for device linking when host linking uses threads
83c13ca44f FindThreads: Pass -pthread to CUDA compiler through -Xcompiler
cf92fd9ae9 Merge branch 'cuda-filter-device-link-items' into cuda-thread-flags
e768d96c74 CUDA: Filter out host link flags during device linking
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Kelly (KT) Thompson <kgt at lanl.gov>
Merge-request: !2512
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c31eae65982c84d570217dd1493eb1d2ba6ee45
commit 1c31eae65982c84d570217dd1493eb1d2ba6ee45
Merge: 89ab893 95c8a03
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 25 11:25:23 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 25 07:25:45 2018 -0400
Merge topic 'tar-warnings'
95c8a03f00 cmake: Distinguish '-E tar' warnings from errors copying data
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2519
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89ab893469576e3cd164019b80bc96daee2ce9b1
commit 89ab893469576e3cd164019b80bc96daee2ce9b1
Merge: 6026470 a834bca
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 25 11:25:05 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 25 07:25:13 2018 -0400
Merge topic 'fix-no-testing'
a834bcaa91 Tests: Add missing BUILD_TESTING conditions
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Dan Ibanez <daibane at sandia.gov>
Merge-request: !2520
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf863b2e4ee2fbc44fde6d14cfac1b7733a09b07
commit cf863b2e4ee2fbc44fde6d14cfac1b7733a09b07
Merge: d17755f 95c8a03
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 24 10:45:23 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 24 10:52:08 2018 -0400
Merge branch 'tar-warnings' into release-3.12
Merge-request: !2519
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d17755f9cf583387fab83ad5744b93c746aa5994
commit d17755f9cf583387fab83ad5744b93c746aa5994
Merge: 32fdbd5 e768d96
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 24 10:23:55 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 24 10:23:55 2018 -0400
Merge branch 'cuda-filter-device-link-items' into release-3.12
Merge-request: !2512
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 7 ++--
Modules/FindThreads.cmake | 4 +-
Source/cmGlobalVisualStudioGenerator.cxx | 5 ++-
Source/cmLinkLineDeviceComputer.cxx | 19 ++++++++-
Source/cmSystemTools.cxx | 44 ++++++++++++++-------
Tests/Cuda/CMakeLists.txt | 1 +
Tests/Cuda/ProperDeviceLibraries/CMakeLists.txt | 45 ++++++++++++++++++++++
.../ProperDeviceLibraries}/main.cu | 9 +++++
Tests/Cuda/ProperDeviceLibraries/use_pthreads.cu | 9 +++++
Tests/Cuda/ProperDeviceLibraries/use_pthreads.cxx | 9 +++++
Tests/CudaOnly/CMakeLists.txt | 1 -
.../LinkSystemDeviceLibraries/CMakeLists.txt | 15 --------
Utilities/cmcurl/CMakeLists.txt | 2 +-
13 files changed, 133 insertions(+), 37 deletions(-)
create mode 100644 Tests/Cuda/ProperDeviceLibraries/CMakeLists.txt
rename Tests/{CudaOnly/LinkSystemDeviceLibraries => Cuda/ProperDeviceLibraries}/main.cu (92%)
create mode 100644 Tests/Cuda/ProperDeviceLibraries/use_pthreads.cu
create mode 100644 Tests/Cuda/ProperDeviceLibraries/use_pthreads.cxx
delete mode 100644 Tests/CudaOnly/LinkSystemDeviceLibraries/CMakeLists.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list