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 4e0c75b78f5745d1369867f25a46ab7d158b4469 (commit)
via 2b427c2fadc917ebcaf2f246d53504ce5b6ad754 (commit)
via 74cc42e937e3117e9514f0c1561f212a8867bc92 (commit)
via 8b83d1fdffeab9d24946552a9b8252c2e0dc4570 (commit)
via 3d48c5404cde1ca5f9956d9587f7d5b134a696eb (commit)
via a586b60129bb29ad99107164439b38f4de60f599 (commit)
via 6962a41e6b83e1ead36ab26b06ebe81aeee0087a (commit)
via 5bc64fe6c25f3c02dda7d22eb65c07bdf2e6eb46 (commit)
via 8068850fcc1575210c968365e71cb7ece6771022 (commit)
via ead16adfc8dc387a59057717521976cbe7ae9067 (commit)
via 19d92d5e6e79448337aface8ed40df78240d674b (commit)
via 186f69cf26b02ec4e2583c846ab3f2d4211997b7 (commit)
via 5731ec30f0596fefede4321e9883043aa7db60ba (commit)
from 3804122ab2793b9d54aa8c69df62ed86f526d50f (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=4e0c75b78f5745d1369867f25a46ab7d158b4469
commit 4e0c75b78f5745d1369867f25a46ab7d158b4469
Merge: 2b427c2 5731ec3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 21 12:42:26 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 21 07:42:32 2018 -0500
Merge topic 'clang-tidy'
5731ec30f0 clang-tidy: fix warnings from version 7
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2636
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b427c2fadc917ebcaf2f246d53504ce5b6ad754
commit 2b427c2fadc917ebcaf2f246d53504ce5b6ad754
Merge: 8b83d1f 74cc42e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 21 12:41:21 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 21 07:41:27 2018 -0500
Merge topic 'FindGIF-modernize'
74cc42e937 Help: Add notes for topic 'FindGIF-modernize'
6962a41e6b FindGIF: Add test
5bc64fe6c2 FindGIF: Modernize
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2632
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74cc42e937e3117e9514f0c1561f212a8867bc92
commit 74cc42e937e3117e9514f0c1561f212a8867bc92
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 21 07:39:58 2018 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Nov 21 07:39:58 2018 -0500
Help: Add notes for topic 'FindGIF-modernize'
diff --git a/Help/release/dev/FindGIF-modernize.rst
b/Help/release/dev/FindGIF-modernize.rst
new file mode 100644
index 0000000..3bb4821
--- /dev/null
+++ b/Help/release/dev/FindGIF-modernize.rst
@@ -0,0 +1,4 @@
+FindGIF-modernize
+-----------------
+
+* The :module:`FindGIF` module now provides imported targets.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b83d1fdffeab9d24946552a9b8252c2e0dc4570
commit 8b83d1fdffeab9d24946552a9b8252c2e0dc4570
Merge: 3d48c54 19d92d5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 21 12:37:04 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 21 07:37:11 2018 -0500
Merge topic 'find-boost-test-version'
19d92d5e6e FindBoost: provide the version in x.y.z format
186f69cf26 FindBoost: test version variables
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2638
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d48c5404cde1ca5f9956d9587f7d5b134a696eb
commit 3d48c5404cde1ca5f9956d9587f7d5b134a696eb
Merge: a586b60 8068850
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 21 07:35:52 2018 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Nov 21 07:35:52 2018 -0500
Merge branch 'release-3.13'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a586b60129bb29ad99107164439b38f4de60f599
commit a586b60129bb29ad99107164439b38f4de60f599
Merge: 3804122 ead16ad
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 21 12:34:42 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 21 07:34:53 2018 -0500
Merge topic 'fortran-submodule-case'
ead16adfc8 Fortran: Fix module dependency scanning with upper-case SUBMODULE
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2644
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6962a41e6b83e1ead36ab26b06ebe81aeee0087a
commit 6962a41e6b83e1ead36ab26b06ebe81aeee0087a
Author: Maximilian Heinzler <m.heinz...@heinzler.de>
AuthorDate: Tue Nov 20 21:03:19 2018 +0100
Commit: Maximilian Heinzler <m.heinz...@heinzler.de>
CommitDate: Tue Nov 20 21:07:03 2018 +0100
FindGIF: Add test
This tests whether GIFLIB can be found and the linker works. For newer
versions (>=5) it also tests if the version was parsed correctly.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 96cdfd0..8b5f2e9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1388,6 +1388,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
add_subdirectory(FindGDAL)
endif()
+ if(CMake_TEST_FindGIF)
+ add_subdirectory(FindGIF)
+ endif()
+
if(CMake_TEST_FindGSL)
add_subdirectory(FindGSL)
endif()
diff --git a/Tests/FindGIF/CMakeLists.txt b/Tests/FindGIF/CMakeLists.txt
new file mode 100644
index 0000000..bac64af
--- /dev/null
+++ b/Tests/FindGIF/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_test(NAME FindGIF.Test COMMAND
+ ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
+ --build-and-test
+ "${CMake_SOURCE_DIR}/Tests/FindGIF/Test"
+ "${CMake_BINARY_DIR}/Tests/FindGIF/Test"
+ ${build_generator_args}
+ --build-project TestFindGIF
+ --build-options ${build_options}
+ --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
+ )
diff --git a/Tests/FindGIF/Test/CMakeLists.txt
b/Tests/FindGIF/Test/CMakeLists.txt
new file mode 100644
index 0000000..961e636
--- /dev/null
+++ b/Tests/FindGIF/Test/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.4)
+project(TestFindGIF C)
+include(CTest)
+
+find_package(GIF REQUIRED)
+
+add_definitions(-DCMAKE_EXPECTED_GIF_VERSION="${GIF_VERSION}")
+
+add_executable(test_tgt main.c)
+target_link_libraries(test_tgt GIF::GIF)
+add_test(NAME test_tgt COMMAND test_tgt)
+
+add_executable(test_var main.c)
+target_include_directories(test_var PRIVATE ${GIF_INCLUDE_DIRS})
+target_link_libraries(test_var PRIVATE ${GIF_LIBRARIES})
+add_test(NAME test_var COMMAND test_var)
diff --git a/Tests/FindGIF/Test/main.c b/Tests/FindGIF/Test/main.c
new file mode 100644
index 0000000..4ed72ec
--- /dev/null
+++ b/Tests/FindGIF/Test/main.c
@@ -0,0 +1,35 @@
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <gif_lib.h>
+
+// GIFLIB before version 5 didn't know this macro
+#ifndef GIFLIB_MAJOR
+# define GIFLIB_MAJOR 4
+#endif
+
+int main()
+{
+ // because of the API changes we have to test different functions depending
+ // on the version of GIFLIB
+#if GIFLIB_MAJOR >= 5
+ // test the linker
+ GifErrorString(D_GIF_SUCCEEDED);
+
+ // check the version
+ char gif_version_string[16];
+ snprintf(gif_version_string, 16, "%i.%i.%i", GIFLIB_MAJOR, GIFLIB_MINOR,
+ GIFLIB_RELEASE);
+
+ assert(strcmp(gif_version_string, CMAKE_EXPECTED_GIF_VERSION) == 0);
+#else
+ // test the linker
+ GifLastError();
+
+ // unfortunately there is no way to check the version in older version of
+ // GIFLIB
+#endif
+
+ return 0;
+}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bc64fe6c25f3c02dda7d22eb65c07bdf2e6eb46
commit 5bc64fe6c25f3c02dda7d22eb65c07bdf2e6eb46
Author: Maximilian Heinzler <m.heinz...@heinzler.de>
AuthorDate: Sun Nov 18 16:59:50 2018 +0100
Commit: Maximilian Heinzler <m.heinz...@heinzler.de>
CommitDate: Tue Nov 20 21:07:03 2018 +0100
FindGIF: Modernize
This brings the module up to the current find module standards by adding
the GIF_INCLUDE_DIRS variable and the target GIF::GIF. It also updates
the documentation style to that of similar modules.
diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake
index 9a995af..9687b57 100644
--- a/Modules/FindGIF.cmake
+++ b/Modules/FindGIF.cmake
@@ -7,22 +7,43 @@ FindGIF
This finds the GIF library (giflib)
-The module defines the following variables:
+Imported targets
+^^^^^^^^^^^^^^^^
+
+This module defines the following :prop_tgt:`IMPORTED` target:
+
+``GIF::GIF``
+ The giflib library, if found.
+
+Result variables
+^^^^^^^^^^^^^^^^
+
+This module will set the following variables in your project:
``GIF_FOUND``
- True if giflib was found
+ If false, do not try to use GIF.
+``GIF_INCLUDE_DIRS``
+ where to find gif_lib.h, etc.
``GIF_LIBRARIES``
- Libraries to link to in order to use giflib
-``GIF_INCLUDE_DIR``
- where to find the headers
+ the libraries needed to use GIF.
``GIF_VERSION``
- 3, 4 or a full version string (eg 5.1.4) for versions >= 4.1.6
+ 3, 4 or a full version string (eg 5.1.4) for versions >= 4.1.6.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
-The minimum required version of giflib can be specified using the
-standard syntax, e.g. find_package(GIF 4)
+``GIF_INCLUDE_DIR``
+ where to find the GIF headers.
+``GIF_LIBRARY``
+ where to find the GIF library.
+
+Hints
+^^^^^
-$GIF_DIR is an environment variable that would correspond to the
-./configure --prefix=$GIF_DIR
+``GIF_DIR`` is an environment variable that would correspond to the
+``./configure --prefix=$GIF_DIR``.
#]=======================================================================]
# Created by Eric Wing.
@@ -44,9 +65,6 @@ find_library(GIF_LIBRARY
PATH_SUFFIXES lib
)
-# see readme.txt
-set(GIF_LIBRARIES ${GIF_LIBRARY})
-
# Very basic version detection.
# The GIF_LIB_VERSION string in gif_lib.h seems to be unreliable, since it
seems
# to be always " Version 2.0, " in versions 3.x of giflib.
@@ -90,4 +108,20 @@
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GIF REQUIRED_VARS GIF_LIBRARY
GIF_INCLUDE_DIR
VERSION_VAR GIF_VERSION )
+if(GIF_FOUND)
+ set(GIF_INCLUDE_DIRS "${GIF_INCLUDE_DIR}")
+ set(GIF_LIBRARIES ${GIF_LIBRARY})
+
+ if(NOT TARGET GIF::GIF)
+ add_library(GIF::GIF UNKNOWN IMPORTED)
+ set_target_properties(GIF::GIF PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${GIF_INCLUDE_DIRS}")
+ if(EXISTS "${GIF_LIBRARY}")
+ set_target_properties(GIF::GIF PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+ IMPORTED_LOCATION "${GIF_LIBRARY}")
+ endif()
+ endif()
+endif()
+
mark_as_advanced(GIF_INCLUDE_DIR GIF_LIBRARY)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19d92d5e6e79448337aface8ed40df78240d674b
commit 19d92d5e6e79448337aface8ed40df78240d674b
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Mon Nov 19 16:23:31 2018 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Tue Nov 20 10:45:24 2018 -0500
FindBoost: provide the version in x.y.z format
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index ccd245b..a336495 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -35,6 +35,7 @@ case results are reported in variables::
Boost_MAJOR_VERSION - Boost major version number (X in X.y.z)
Boost_MINOR_VERSION - Boost minor version number (Y in x.Y.z)
Boost_SUBMINOR_VERSION - Boost subminor version number (Z in x.y.Z)
+ Boost_VERSION_STRING - Boost version number in x.y.z format
Boost_LIB_DIAGNOSTIC_DEFINITIONS (Windows)
- Pass to add_definitions() to have diagnostic
information about Boost's automatic linking
@@ -1371,6 +1372,7 @@ if(Boost_INCLUDE_DIR)
math(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
math(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
math(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
+ set(Boost_VERSION_STRING
"${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
string(APPEND Boost_ERROR_REASON
"Boost version:
${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost
include path: ${Boost_INCLUDE_DIR}")
diff --git a/Tests/FindBoost/Test/CMakeLists.txt
b/Tests/FindBoost/Test/CMakeLists.txt
index 81433ea..39e92c1 100644
--- a/Tests/FindBoost/Test/CMakeLists.txt
+++ b/Tests/FindBoost/Test/CMakeLists.txt
@@ -14,7 +14,7 @@ if(NOT Boost_PROGRAM_OPTIONS_FOUND)
endif(NOT Boost_PROGRAM_OPTIONS_FOUND)
add_definitions(-DCMAKE_EXPECTED_BOOST_VERSION="${Boost_VERSION}")
-add_definitions(-DCMAKE_EXPECTED_BOOST_VERSION_COMPONENTS="${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+add_definitions(-DCMAKE_EXPECTED_BOOST_VERSION_COMPONENTS="${Boost_VERSION_STRING}")
add_executable(test_boost_tgt main.cxx)
target_link_libraries(test_boost_tgt
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=186f69cf26b02ec4e2583c846ab3f2d4211997b7
commit 186f69cf26b02ec4e2583c846ab3f2d4211997b7
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Mon Nov 19 16:21:55 2018 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Tue Nov 20 10:45:24 2018 -0500
FindBoost: test version variables
diff --git a/Tests/FindBoost/Test/CMakeLists.txt
b/Tests/FindBoost/Test/CMakeLists.txt
index 663f414..81433ea 100644
--- a/Tests/FindBoost/Test/CMakeLists.txt
+++ b/Tests/FindBoost/Test/CMakeLists.txt
@@ -13,6 +13,9 @@ if(NOT Boost_PROGRAM_OPTIONS_FOUND)
message(FATAL_ERROR "Optional Boost component \"program_options\" not found
which is unexpected")
endif(NOT Boost_PROGRAM_OPTIONS_FOUND)
+add_definitions(-DCMAKE_EXPECTED_BOOST_VERSION="${Boost_VERSION}")
+add_definitions(-DCMAKE_EXPECTED_BOOST_VERSION_COMPONENTS="${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+
add_executable(test_boost_tgt main.cxx)
target_link_libraries(test_boost_tgt
Boost::dynamic_linking
diff --git a/Tests/FindBoost/Test/main.cxx b/Tests/FindBoost/Test/main.cxx
index 6e8b5da..50ddadf 100644
--- a/Tests/FindBoost/Test/main.cxx
+++ b/Tests/FindBoost/Test/main.cxx
@@ -20,5 +20,20 @@ int main()
boost::thread foo(threadmain);
foo.join();
- return 0;
+ int version = BOOST_VERSION;
+ int major = version / 100000;
+ int minor = version / 100 % 1000;
+ int patch = version % 100;
+ char version_string[100];
+ snprintf(version_string, sizeof(version_string), "%d.%d.%d", major, minor,
+ patch);
+ printf("Found Boost version %s, expected version %s\n", version_string,
+ CMAKE_EXPECTED_BOOST_VERSION_COMPONENTS);
+ int ret = strcmp(version_string, CMAKE_EXPECTED_BOOST_VERSION_COMPONENTS);
+ char raw_version_string[100];
+ snprintf(raw_version_string, sizeof(raw_version_string), "%d",
+ BOOST_VERSION);
+ printf("Found Boost version %s, expected version %s\n", raw_version_string,
+ CMAKE_EXPECTED_BOOST_VERSION);
+ return ret | strcmp(raw_version_string, CMAKE_EXPECTED_BOOST_VERSION);
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5731ec30f0596fefede4321e9883043aa7db60ba
commit 5731ec30f0596fefede4321e9883043aa7db60ba
Author: Regina Pfeifer <reg...@mailbox.org>
AuthorDate: Mon Nov 19 18:10:40 2018 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 20 10:36:08 2018 -0500
clang-tidy: fix warnings from version 7
Fix some warnings that are new since clang-tidy version 4, and update
`.clang-tidy` to suppress the rest.
diff --git a/.clang-tidy b/.clang-tidy
index 8d79b0c..cec7d03 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -21,15 +21,18 @@ modernize-*,\
-modernize-use-using,\
performance-*,\
-performance-inefficient-string-concatenation,\
+-performance-inefficient-vector-operation,\
readability-*,\
-readability-function-size,\
-readability-identifier-naming,\
-readability-implicit-bool-cast,\
+-readability-implicit-bool-conversion,\
-readability-inconsistent-declaration-parameter-name,\
-readability-named-parameter,\
-readability-redundant-declaration,\
-readability-redundant-member-init,\
-readability-simplify-boolean-expr,\
+-readability-static-accessed-through-instance,\
"
HeaderFilterRegex: 'Source/cm[^/]*\.(h|hxx|cxx)$'
...
diff --git a/Source/QtDialog/AddCacheEntry.cxx
b/Source/QtDialog/AddCacheEntry.cxx
index 6284ac9..70610d7 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -21,8 +21,8 @@ AddCacheEntry::AddCacheEntry(QWidget* p, const QStringList&
varNames,
, VarTypes(varTypes)
{
this->setupUi(this);
- for (int i = 0; i < NumTypes; i++) {
- this->Type->addItem(TypeStrings[i]);
+ for (auto const& elem : TypeStrings) {
+ this->Type->addItem(elem);
}
QWidget* cb = new QCheckBox();
QWidget* path = new QCMakePathEditor();
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index 0ccd68a..27f9131 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -684,7 +684,7 @@ cmELF::cmELF(const char* fname)
std::unique_ptr<cmsys::ifstream> fin(new cmsys::ifstream(fname));
// Quit now if the file could not be opened.
- if (!fin.get() || !*fin) {
+ if (!fin || !*fin) {
this->ErrorMessage = "Error opening input file.";
return;
}
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index bddc3c4..df27c62 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -79,7 +79,7 @@ bool cmExportFileGenerator::GenerateImportFile()
ap->SetCopyIfDifferent(true);
foutPtr = std::move(ap);
}
- if (!foutPtr.get() || !*foutPtr) {
+ if (!foutPtr || !*foutPtr) {
std::string se = cmSystemTools::GetLastSystemError();
std::ostringstream e;
e << "cannot write to file \"" << this->MainImportFile << "\": " << se;
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index f86e5e2..3012b0a 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -2824,7 +2824,7 @@ bool
cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args)
std::string algo = i->substr(0, pos);
expectedHash = cmSystemTools::LowerCase(i->substr(pos + 1));
hash = std::unique_ptr<cmCryptoHash>(cmCryptoHash::New(algo.c_str()));
- if (!hash.get()) {
+ if (!hash) {
std::string err = "DOWNLOAD EXPECTED_HASH given unknown ALGO: ";
err += algo;
this->SetError(err);
diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx
index 9ff967c..739c9c0 100644
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@@ -38,7 +38,7 @@ bool cmForEachFunctionBlocker::IsFunctionBlocked(const
cmListFileFunction& lff,
// Remove the function blocker for this scope or bail.
std::unique_ptr<cmFunctionBlocker> fb(
mf.RemoveFunctionBlocker(this, lff));
- if (!fb.get()) {
+ if (!fb) {
return false;
}
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 0b28d1e..80d81d5 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4379,8 +4379,7 @@ const char* impliedValue<const char*>(const char*
/*unused*/)
return "";
}
template <>
-std::string impliedValue<std::string>(
- std::string /*unused*/) // NOLINT(clang-tidy)
+std::string impliedValue<std::string>(std::string /*unused*/) // NOLINT(*)
{
return std::string();
}
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index fbc756c..0271b6f 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -112,7 +112,7 @@ std::string cmGlobalNinjaGenerator::EncodeLiteral(const
std::string& lit)
std::string cmGlobalNinjaGenerator::EncodePath(const std::string& path)
{
- std::string result = path; // NOLINT(clang-tidy)
+ std::string result = path;
#ifdef _WIN32
if (this->IsGCCOnWindows())
std::replace(result.begin(), result.end(), '\\', '/');
@@ -254,7 +254,7 @@ void cmGlobalNinjaGenerator::WriteCustomCommandBuild(
bool restat, const cmNinjaDeps& outputs, const cmNinjaDeps& deps,
const cmNinjaDeps& orderOnly)
{
- std::string cmd = command; // NOLINT(clang-tidy)
+ std::string cmd = command; // NOLINT(*)
#ifdef _WIN32
if (cmd.empty())
// TODO Shouldn't an empty command be handled by ninja?
@@ -1940,7 +1940,7 @@ int
cmcmd_cmake_ninja_dyndep(std::vector<std::string>::const_iterator argBeg,
cm.SetHomeOutputDirectory(dir_top_bld);
std::unique_ptr<cmGlobalNinjaGenerator> ggd(
static_cast<cmGlobalNinjaGenerator*>(cm.CreateGlobalGenerator("Ninja")));
- if (!ggd.get() ||
+ if (!ggd ||
!ggd->WriteDyndepFile(dir_top_src, dir_top_bld, dir_cur_src, dir_cur_bld,
arg_dd, arg_ddis, module_dir,
linked_target_dirs)) {
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index ae4041d..5d952da 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -39,7 +39,7 @@ bool cmIfFunctionBlocker::IsFunctionBlocked(const
cmListFileFunction& lff,
// Remove the function blocker for this scope or bail.
std::unique_ptr<cmFunctionBlocker> fb(
mf.RemoveFunctionBlocker(this, lff));
- if (!fb.get()) {
+ if (!fb) {
return false;
}
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 790f6e0..5ad8ef6 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2342,7 +2342,7 @@ cmMakefile::AppleSDK cmMakefile::GetAppleSDKType() const
{ "watchsimulator", AppleSDK::WatchSimulator },
};
- for (auto entry : sdkDatabase) {
+ for (auto const& entry : sdkDatabase) {
if (sdkRoot.find(entry.name) == 0 ||
sdkRoot.find(std::string("/") + entry.name) != std::string::npos) {
return entry.sdk;
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index d5bcfc2..9d43d19 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -37,7 +37,7 @@ bool cmWhileFunctionBlocker::IsFunctionBlocked(const
cmListFileFunction& lff,
// Remove the function blocker for this scope or bail.
std::unique_ptr<cmFunctionBlocker> fb(
mf.RemoveFunctionBlocker(this, lff));
- if (!fb.get()) {
+ if (!fb) {
return false;
}
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 35730b8..2ac7f4d 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2596,7 +2596,7 @@ bool cmake::Open(const std::string& dir, bool dryRun)
std::unique_ptr<cmGlobalGenerator> gen(
this->CreateGlobalGenerator(fullName));
- if (!gen.get()) {
+ if (!gen) {
std::cerr << "Error: could create CMAKE_GENERATOR \"" << fullName
<< "\"\n";
return false;
-----------------------------------------------------------------------
Summary of changes:
.clang-tidy | 3 +
Help/release/dev/FindGIF-modernize.rst | 4 +
Modules/FindBoost.cmake | 2 +
Modules/FindGIF.cmake | 60 ++++++--
Source/LexerParser/cmFortranLexer.cxx | 226 +++++++++++++++---------------
Source/LexerParser/cmFortranLexer.in.l | 2 +-
Source/QtDialog/AddCacheEntry.cxx | 4 +-
Source/cmELF.cxx | 2 +-
Source/cmExportFileGenerator.cxx | 2 +-
Source/cmFileCommand.cxx | 2 +-
Source/cmForEachCommand.cxx | 2 +-
Source/cmGeneratorTarget.cxx | 3 +-
Source/cmGlobalNinjaGenerator.cxx | 6 +-
Source/cmIfCommand.cxx | 2 +-
Source/cmMakefile.cxx | 2 +-
Source/cmWhileCommand.cxx | 2 +-
Source/cmake.cxx | 2 +-
Tests/CMakeLists.txt | 4 +
Tests/FindBoost/Test/CMakeLists.txt | 3 +
Tests/FindBoost/Test/main.cxx | 17 ++-
Tests/{FindPNG => FindGIF}/CMakeLists.txt | 8 +-
Tests/FindGIF/Test/CMakeLists.txt | 16 +++
Tests/FindGIF/Test/main.c | 35 +++++
Tests/FortranModules/Submodules/child.f90 | 6 +-
24 files changed, 265 insertions(+), 150 deletions(-)
create mode 100644 Help/release/dev/FindGIF-modernize.rst
copy Tests/{FindPNG => FindGIF}/CMakeLists.txt (55%)
create mode 100644 Tests/FindGIF/Test/CMakeLists.txt
create mode 100644 Tests/FindGIF/Test/main.c
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
