[Cmake-commits] CMake branch, master, updated. v3.14.0-rc3-300-g83183cb
Kitware Robot
kwrobot at kitware.com
Wed Mar 6 08:43:03 EST 2019
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 83183cbaec0770baa5ed319858227cbbe83a277a (commit)
via fb744ed49c613c1cb83f67af1c98bb2eba69b132 (commit)
via d564d0619496612ea174d221a643fba8d1f62538 (commit)
via 67428e90255443769950cf2c46d00607eb6a878a (commit)
via 64e2c14c4a2be32bcac53067c4cf00364139e9fe (commit)
via c9d2e1cee07a9b93d9584768ce5610af70b7d44d (commit)
from 809890e3f6bcb1a5def21e2e99a54bb6f38505fc (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=83183cbaec0770baa5ed319858227cbbe83a277a
commit 83183cbaec0770baa5ed319858227cbbe83a277a
Merge: fb744ed 67428e9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 6 13:37:05 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 6 08:37:14 2019 -0500
Merge topic 'vs-no-stamp-messages'
67428e9025 VS: Do not print message when generate.stamp is up-to-date.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3054
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb744ed49c613c1cb83f67af1c98bb2eba69b132
commit fb744ed49c613c1cb83f67af1c98bb2eba69b132
Merge: d564d06 c9d2e1c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 6 13:36:10 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 6 08:36:17 2019 -0500
Merge topic 'fix-override'
c9d2e1cee0 Fix missing `override`
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3061
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d564d0619496612ea174d221a643fba8d1f62538
commit d564d0619496612ea174d221a643fba8d1f62538
Merge: 809890e 64e2c14
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 6 13:33:07 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 6 08:33:25 2019 -0500
Merge topic 'android-versioned-soname'
64e2c14c4a Android: allow user to enable versioned soname
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3063
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67428e90255443769950cf2c46d00607eb6a878a
commit 67428e90255443769950cf2c46d00607eb6a878a
Author: Olli Kallioinen <olli.kallioinen at iki.fi>
AuthorDate: Sat Mar 2 23:37:21 2019 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 5 11:20:42 2019 -0500
VS: Do not print message when generate.stamp is up-to-date.
Fixes: #16783
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index f6f0a95..5a69af6 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -116,10 +116,8 @@ typedef std::unordered_map<std::string, Json::Value> JsonValueMapType;
} // namespace
-static bool cmakeCheckStampFile(const std::string& stampName,
- bool verbose = true);
-static bool cmakeCheckStampList(const std::string& stampList,
- bool verbose = true);
+static bool cmakeCheckStampFile(const std::string& stampName);
+static bool cmakeCheckStampList(const std::string& stampList);
void cmWarnUnusedCliWarning(const std::string& variable, int /*unused*/,
void* ctx, const char* /*unused*/,
@@ -2410,7 +2408,7 @@ int cmake::GetSystemInformation(std::vector<std::string>& args)
return 0;
}
-static bool cmakeCheckStampFile(const std::string& stampName, bool verbose)
+static bool cmakeCheckStampFile(const std::string& stampName)
{
// The stamp file does not exist. Use the stamp dependencies to
// determine whether it is really out of date. This works in
@@ -2462,13 +2460,7 @@ static bool cmakeCheckStampFile(const std::string& stampName, bool verbose)
stamp << "# CMake generation timestamp file for this directory.\n";
}
if (cmSystemTools::RenameFile(stampTemp, stampName)) {
- if (verbose) {
- // Notify the user why CMake is not re-running. It is safe to
- // just print to stdout here because this code is only reachable
- // through an undocumented flag used by the VS generator.
- std::cout << "CMake does not need to re-run because " << stampName
- << " is up-to-date.\n";
- }
+ // CMake does not need to re-run because the stamp file is up-to-date.
return true;
}
cmSystemTools::RemoveFile(stampTemp);
@@ -2476,7 +2468,7 @@ static bool cmakeCheckStampFile(const std::string& stampName, bool verbose)
return false;
}
-static bool cmakeCheckStampList(const std::string& stampList, bool verbose)
+static bool cmakeCheckStampList(const std::string& stampList)
{
// If the stamp list does not exist CMake must rerun to generate it.
if (!cmSystemTools::FileExists(stampList)) {
@@ -2494,7 +2486,7 @@ static bool cmakeCheckStampList(const std::string& stampList, bool verbose)
// Check each stamp.
std::string stampName;
while (cmSystemTools::GetLineFromStream(fin, stampName)) {
- if (!cmakeCheckStampFile(stampName, verbose)) {
+ if (!cmakeCheckStampFile(stampName)) {
return false;
}
}
@@ -2615,7 +2607,7 @@ int cmake::Build(int jobs, const std::string& dir, const std::string& target,
}
}
- if (!cmakeCheckStampList(stampList, false)) {
+ if (!cmakeCheckStampList(stampList)) {
// Correctly initialize the home (=source) and home output (=binary)
// directories, which is required for running the generation step.
std::string homeOrig = this->GetHomeDirectory();
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64e2c14c4a2be32bcac53067c4cf00364139e9fe
commit 64e2c14c4a2be32bcac53067c4cf00364139e9fe
Author: Tom Yan <tom.ty89 at gmail.com>
AuthorDate: Tue Mar 5 23:44:42 2019 +0800
Commit: Tom Yan <tom.ty89 at gmail.com>
CommitDate: Tue Mar 5 23:44:42 2019 +0800
Android: allow user to enable versioned soname
diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake
index 3d69733..f08f841 100644
--- a/Modules/Platform/Android.cmake
+++ b/Modules/Platform/Android.cmake
@@ -2,9 +2,11 @@ include(Platform/Linux)
set(ANDROID 1)
-# Android has soname, but binary names must end in ".so" so we cannot append
-# a version number. Also we cannot portably represent symlinks on the host.
-set(CMAKE_PLATFORM_NO_VERSIONED_SONAME 1)
+# Conventionally Android does not use versioned soname
+# But in modern versions it is acceptable
+if(NOT DEFINED CMAKE_PLATFORM_NO_VERSIONED_SONAME)
+ set(CMAKE_PLATFORM_NO_VERSIONED_SONAME 1)
+endif()
# Android reportedly ignores RPATH, and we cannot predict the install
# location anyway.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9d2e1cee07a9b93d9584768ce5610af70b7d44d
commit c9d2e1cee07a9b93d9584768ce5610af70b7d44d
Author: Vitaly Stakhovsky <vvs31415 at gitlab.org>
AuthorDate: Mon Mar 4 19:55:31 2019 -0500
Commit: Vitaly Stakhovsky <vvs31415 at gitlab.org>
CommitDate: Mon Mar 4 19:55:31 2019 -0500
Fix missing `override`
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
index 2f9eb3f..94f6b68 100644
--- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx
+++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
@@ -206,8 +206,8 @@ class cmGlobalVisualStudioVersionedGenerator::Factory16
: public cmGlobalGeneratorFactory
{
public:
- virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
- cmake* cm) const
+ cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
+ cmake* cm) const override
{
std::string genName;
const char* p = cmVS16GenName(name, genName);
@@ -221,7 +221,7 @@ public:
return 0;
}
- virtual void GetDocumentation(cmDocumentationEntry& entry) const
+ void GetDocumentation(cmDocumentationEntry& entry) const override
{
entry.Name = std::string(vs16generatorName);
entry.Brief = "Generates Visual Studio 2019 project files. "
diff --git a/Source/cmLocalGhsMultiGenerator.h b/Source/cmLocalGhsMultiGenerator.h
index d5bec42..2584fd3 100644
--- a/Source/cmLocalGhsMultiGenerator.h
+++ b/Source/cmLocalGhsMultiGenerator.h
@@ -23,7 +23,7 @@ public:
/**
* Generate the makefile for this directory.
*/
- virtual void Generate();
+ void Generate() override;
std::string GetTargetDirectory(
cmGeneratorTarget const* target) const override;
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Android.cmake | 8 +++++---
Source/cmGlobalVisualStudioVersionedGenerator.cxx | 6 +++---
Source/cmLocalGhsMultiGenerator.h | 2 +-
Source/cmake.cxx | 22 +++++++---------------
4 files changed, 16 insertions(+), 22 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list