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 2c2c575383c049a312a9a276e195df6699364530 (commit)
via 24916ce81e1bd172a5d17450cab24282e6364819 (commit)
via ab63072381171e9c5a7164536f0912b8b3a4a313 (commit)
via dad271e8b7eec9ce781bccb9e7e7c9ed4f55003c (commit)
via 1e1e306d9a13cdc1f8110c84192c37d7eedf5b3c (commit)
via 276b56f01c757ef0fc8b08d2a55422c59b3f007c (commit)
via 563205d6f84251dfef9658853e0b9a90af9ced71 (commit)
via 3092c27f30b52e737a499a3eb91b2a160e9f3863 (commit)
from 0da805bff39f5e465d48f678f3b49b3dc738ab9f (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=2c2c575383c049a312a9a276e195df6699364530
commit 2c2c575383c049a312a9a276e195df6699364530
Merge: 24916ce 563205d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 17 12:05:59 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Jun 17 08:06:46 2019 -0400
Merge topic 'cmDefinitions_avoid_string_copy'
563205d6f8 cmDefinitions: Avoid string copy when setting a definition
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3443
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24916ce81e1bd172a5d17450cab24282e6364819
commit 24916ce81e1bd172a5d17450cab24282e6364819
Merge: ab63072 3092c27
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 17 12:05:29 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Jun 17 08:05:53 2019 -0400
Merge topic 'cpack-deb-soname'
3092c27f30 CPack: Fix SONAME regex in DEB generator
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3440
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab63072381171e9c5a7164536f0912b8b3a4a313
commit ab63072381171e9c5a7164536f0912b8b3a4a313
Merge: 1e1e306 dad271e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 17 08:05:42 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jun 17 08:05:42 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e1e306d9a13cdc1f8110c84192c37d7eedf5b3c
commit 1e1e306d9a13cdc1f8110c84192c37d7eedf5b3c
Merge: 0da805b 276b56f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 17 12:03:14 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Jun 17 08:03:22 2019 -0400
Merge topic 'FindBLAS-OpenBLAS-thread'
276b56f01c FindBLAS: Add second try for OpenBLAS with thread libraries.
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3434
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=563205d6f84251dfef9658853e0b9a90af9ced71
commit 563205d6f84251dfef9658853e0b9a90af9ced71
Author: Sebastian Holtermann <sebh...@xwmw.org>
AuthorDate: Thu Jun 13 12:01:08 2019 +0200
Commit: Sebastian Holtermann <sebh...@xwmw.org>
CommitDate: Thu Jun 13 12:01:08 2019 +0200
cmDefinitions: Avoid string copy when setting a definition
diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx
index 5fafaf9..894447c 100644
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@ -57,8 +57,7 @@ bool cmDefinitions::HasKey(const std::string& key, StackIter
begin,
void cmDefinitions::Set(const std::string& key, const char* value)
{
- Def def(value);
- this->Map[key] = def;
+ this->Map[key] = Def(value);
}
std::vector<std::string> cmDefinitions::UnusedKeys() const
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3092c27f30b52e737a499a3eb91b2a160e9f3863
commit 3092c27f30b52e737a499a3eb91b2a160e9f3863
Author: Kyle Edwards <kyle.edwa...@kitware.com>
AuthorDate: Wed Jun 12 10:13:43 2019 -0400
Commit: Kyle Edwards <kyle.edwa...@kitware.com>
CommitDate: Wed Jun 12 10:13:43 2019 -0400
CPack: Fix SONAME regex in DEB generator
The DEB generator was written to parse output from GNU readelf.
However, LLVM's readelf has a slightly different output format,
without parentheses around the word "SONAME". Update the regex to
account for this difference.
Fixes: #19362
diff --git a/Modules/Internal/CPack/CPackDeb.cmake
b/Modules/Internal/CPack/CPackDeb.cmake
index 89dc6f0..7791822 100644
--- a/Modules/Internal/CPack/CPackDeb.cmake
+++ b/Modules/Internal/CPack/CPackDeb.cmake
@@ -45,7 +45,7 @@ function(extract_so_info shared_object libname version)
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(result EQUAL 0)
- string(REGEX MATCH "\\(SONAME\\)[^\n]*\\[([^\n]+)\\.so\\.([^\n]*)\\]"
soname "${output}")
+ string(REGEX MATCH "\\(?SONAME\\)?[^\n]*\\[([^\n]+)\\.so\\.([^\n]*)\\]"
soname "${output}")
set(${libname} "${CMAKE_MATCH_1}" PARENT_SCOPE)
set(${version} "${CMAKE_MATCH_2}" PARENT_SCOPE)
else()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBLAS.cmake | 16 +++++++++++++++-
Modules/Internal/CPack/CPackDeb.cmake | 2 +-
Source/cmDefinitions.cxx | 3 +--
3 files changed, 17 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
