Commit Graph

37473 Commits

Author SHA1 Message Date
Brad King 41492c2d99 Merge topic 'FindMatlab-version-quoting'
a245f850 FindMatlab: Fix extraction of quoted version number

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1316
2017-09-29 08:54:22 -04:00
Brad King 194dd9ea8b Merge topic 'autogen-macro-names2'
93c8d55d Autogen: Update (CMAKE_)AUTOMOC_MACRO_NAMES release notes
084ace47 Autogen: Tests: Update AUTOMOC_MACRO_NAMES test
08041dd1 Autogen: Doc: Update documentation for (CMAKE_)AUTOMOC_MACRO_NAMES
7b33d67b Autogen: Create info file directory before writing
786b5be0 Autogen: Define all macro names in CMAKE_AUTOMOC_MACRO_NAMES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1321
2017-09-29 08:53:13 -04:00
Brad King 460a94e29f Merge topic 'autogen-cmp0071-warning'
ff6a5125 Autogen: Doc: Add examples to the SKIP_AUTO* documentations
8831818f Autogen: Doc: Update CMP0071 description
b0775c75 Autogen: Offer solution for CMP0071 in warning message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1322
2017-09-29 08:52:44 -04:00
Brad King e6e32101d8 Merge topic 'cxx11-eq-delete'
b8018135 Use C++11 '= delete' instead of CM_EQ_DELETE
42f4e697 Drop unused CMake_HAVE_CXX_UNIQUE_PTR macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1326
2017-09-29 08:49:02 -04:00
Brad King e24e0ff6fa Merge topic 'clang-tidy'
77f674be Fix some occurrences of readability-braces-around-statements
f0bab294 Convert some leftover loops to C++11 range-based loop
b5d7f5b0 Fix occurrences of readability-non-const-parameter
9a2da339 Fix some occurrences of readability-avoid-const-params-in-decls
870dd06d Fix left-over occurrences of else-after-return
2033abff Fix minor clang-tidy findings
79b8c380 Improve several occurrences of vector::push_back in loops
a45928cd Fix some occurrences of missing override keywords
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1292
2017-09-29 08:48:16 -04:00
Kitware Robot f920ffd8f3 CMake Nightly Date Stamp 2017-09-29 00:01:03 -04:00
Brad King b8018135b5 Use C++11 '= delete' instead of CM_EQ_DELETE
We now require C++11 support including `= delete`.  Drop use of
the old compatibility macro.
2017-09-28 09:50:18 -04:00
Brad King 42f4e6974c Drop unused CMake_HAVE_CXX_UNIQUE_PTR macro
We now require C++11 `std::unique_ptr` support from the compiler,
so none of our code is conditioned on the macro.
2017-09-28 09:50:17 -04:00
Brad King 50e4a45b9f Merge topic 'remove-auto_ptr-checks'
9e0362ca Remove checks for auto_ptr that we no longer need
94e67fa1 cpack: Fix compilation on Cygwin after auto_ptr removal

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1320
2017-09-28 08:08:27 -04:00
Matthias Maennich 77f674be35 Fix some occurrences of readability-braces-around-statements
Fix issues diagnosed by clang-tidy [readability-braces-around-statements]

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-28 07:23:43 -04:00
Matthias Maennich f0bab294dc Convert some leftover loops to C++11 range-based loop
Fix issues diagnosed by clang-tidy [modern-loop-convert]

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-28 07:23:43 -04:00
Matthias Maennich b5d7f5b0e8 Fix occurrences of readability-non-const-parameter
Fix issues diagnosed by clang-tidy [readability-non-const-parameter]

The patch separates the definitions of the function headers for the two
variants (CMAKE_USE_ELF_PARSER or not) and comments out the parameter names
to not consider them for any const-ness in the case they are actually not
even looked at.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-28 07:23:42 -04:00
Matthias Maennich 9a2da33950 Fix some occurrences of readability-avoid-const-params-in-decls
Fix issues diagnosed by clang-tidy [readability-avoid-const-params-in-decls]

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-28 07:23:42 -04:00
Matthias Maennich 870dd06da1 Fix left-over occurrences of else-after-return
Fix issues diagnosed by clang-tidy [readability-else-after-return]

These were mostly only showing up on OSX.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-28 07:23:42 -04:00
Matthias Maennich 2033abff0d Fix minor clang-tidy findings
Fix issues diagnosed by clang-tidy
 - modernize-use-bool-literals
 - misc-string-integer-assignment
 - performance-faster-string-find
 - readability-redundant-string-cstr
 - readability-delete-null-pointer

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-28 07:23:42 -04:00
Matthias Maennich 79b8c3802a Improve several occurrences of vector::push_back in loops
Fix issues diagnosed by clang-tidy by pre-allocating the vector capacity
before the loop [performance-inefficient-vector-operation].

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-28 07:23:41 -04:00
Matthias Maennich a45928cdeb Fix some occurrences of missing override keywords
Fix issues diagnosed by clang-tidy [modernize-use-override].

These occurrences are only showing up on OSX.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-28 07:23:41 -04:00
Matthias Maennich b128f8c5bc Clean up some C-Style casts
Fix issues diagnosed by clang-tidy [google-readability-casting]

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-28 07:23:41 -04:00
Matthias Maennich bb0ad1bea8 Fix some occurrences using string by value rather than by const&
Fix issues diagnosed by clang-tidy
 - performance-unnecessary-value-param
 - performance-unnecessary-copy-initialization

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-28 07:23:40 -04:00
Matthias Maennich 8cc33aeaec Replace several occurrences of empty string comparisons by string::empty()
Fix issues diagnosed by clang-tidy [readability-container-size-empty]

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-28 07:23:40 -04:00
Matthias Maennich ffefdb2c08 clang-tidy: Make .clang-tidy a build-time dependency
Currently a change to the clang-tidy configuration remains unnoticed for
incremental builds in the way that it won't trigger a rebuild. This can be
considered a missing dependency that this patch fixes by introducing a
compile time definition (-DCLANG_TIDY_SHA1) that triggers a rebuild upon
change. Currently this only applies to the target CMakeLib.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-28 07:23:39 -04:00
Brad King 7cf089fcbf clang-tidy: exclude 'modernize-use-noexcept' introduced in 5.0.0
We still support compiling CMake on VS 2013 that does not support
`noexcept`, so disable the clang-tidy diagnostic for now.
2017-09-28 07:19:27 -04:00
Sebastian Holtermann ff6a51254a Autogen: Doc: Add examples to the SKIP_AUTO* documentations 2017-09-28 12:34:27 +02:00
Sebastian Holtermann 8831818f14 Autogen: Doc: Update CMP0071 description 2017-09-28 12:34:27 +02:00
Sebastian Holtermann b0775c751b Autogen: Offer solution for CMP0071 in warning message 2017-09-28 12:34:26 +02:00
Sebastian Holtermann 93c8d55d04 Autogen: Update (CMAKE_)AUTOMOC_MACRO_NAMES release notes 2017-09-28 09:21:44 +02:00
Sebastian Holtermann 084ace47b6 Autogen: Tests: Update AUTOMOC_MACRO_NAMES test 2017-09-28 09:21:44 +02:00
Sebastian Holtermann 08041dd15e Autogen: Doc: Update documentation for (CMAKE_)AUTOMOC_MACRO_NAMES 2017-09-28 09:21:44 +02:00
Sebastian Holtermann 7b33d67bc5 Autogen: Create info file directory before writing 2017-09-28 09:21:44 +02:00
Kitware Robot a1d59d3e07 CMake Nightly Date Stamp 2017-09-28 00:01:05 -04:00
Matthias Maennich 76c634c4ac clang-tidy: exclude 'modernize-return-braced-init-list' introduced in 5.0.0
Due to many occurrences and as I am not sure about the coding guide lines
in regards to this, I blacklist it.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-27 15:25:40 -04:00
Brad King 9e0362caa1 Remove checks for auto_ptr that we no longer need
We no longer use `auto_ptr` at all, so drop the checks for it.
2017-09-27 09:04:31 -04:00
Brad King 94e67fa118 cpack: Fix compilation on Cygwin after auto_ptr removal
Fix a compilation error on Cygwin introduced by commit f0489856e3
(Retire std::auto_ptr and its macro CM_AUTO_PTR, 2017-09-21).
2017-09-27 09:04:28 -04:00
Craig Scott a2eec58dfa Merge topic 'document_env_variables'
e6b77c5f Help: Document CMake's environment variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1235
2017-09-27 09:01:35 -04:00
Sebastian Holtermann 786b5be03b Autogen: Define all macro names in CMAKE_AUTOMOC_MACRO_NAMES
Instead of adding `Q_OBJECT` and `Q_GADGET` to the macro search list
in `Source/cmQtAutoGenerators.cxx`, add them in
`Modules/CMakeGenericSystem.cmake` to the default value of
`CMAKE_AUTOMOC_MACRO_NAMES`.
Also add `Q_NAMESPACE` to `CMAKE_AUTOMOC_MACRO_NAMES`
which closes #17299.
2017-09-27 14:13:12 +02:00
Brad King 825baaa1b3 Merge topic 'CMakeCPack-source-ignore'
fa23f66a CMakeCPack: Exclude version-control-specific files from source package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1314
2017-09-27 07:36:06 -04:00
Brad King 068effa4d8 Merge topic 'auto_ptr'
f0489856 Retire std::auto_ptr and its macro CM_AUTO_PTR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Merge-request: !1300
2017-09-27 07:25:11 -04:00
Brad King bb371753cb Merge topic 'vs-guid-tolerate-no-curly'
b3e6514c VS: Adapt project parsers to support "ProjectGUID" without curly brackets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1313
2017-09-27 07:23:51 -04:00
Brad King 2c50f7a795 Merge topic 'reduce-strcpy'
e43cb4c1 CursesDialog: avoid calling strcpy()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1311
2017-09-27 07:16:47 -04:00
Brad King f9c619105c Merge topic 'GetPrerequisites-no-clear-on-missing'
1a7b8c83 GetPrerequisites: Restore behavior on missing binary of not clearing list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1312
2017-09-27 07:16:06 -04:00
Brad King 05e234cb16 Merge topic 'autogen-per-config-sources'
4603d6b0 Autogen: Docs: Add documentation internal links
f86ba8ee Autogen: Reintroduce per-config sources support
5d3bca64 Autogen: Rename cmQtAutoGen::GeneratorType to cmQtAutogen::Generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1307
2017-09-27 07:15:12 -04:00
Brad King f75ac39692 Merge topic 'ninja-rc-depfile-quoting'
df965cb9 Ninja: Fix quoting of RC language depfile in cmcldeps call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1309
2017-09-27 07:14:17 -04:00
Brad King c4d0939fba Merge topic 'FindOpenGL-glvnd'
e2e8a690 FindOpenGL: Add support for GLVND on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !782
2017-09-27 07:13:12 -04:00
Brad King 09350f19e0 Merge topic 'revert-perf-source-lookup'
a7005c98 Tests: Add case for legacy source file property behavior
1604716d Revert "Performance: Improve efficiency of source file lookup in cmMakefile"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1308
2017-09-27 07:11:07 -04:00
Brad King a245f850bc FindMatlab: Fix extraction of quoted version number
The version string in recent Matlab versions has changed.
Now the version number is inside two `'`.

Patch-by: nama on gitlab.kitware.com
Fixes: #17308
2017-09-27 06:56:10 -04:00
Brad King f4517a4767 Merge branch 'release-3.9'
Use the "ours" merge strategy because we're merging a fixup that is
specific to the 3.9 branch and do not need the changes in `master`.
2017-09-27 06:14:38 -04:00
Brad King d70ef7eff6 Merge branch 'FindBoost-fix-policy-scope' into release-3.9
This has no corresponding merge-request because the branch was
made as a direct fixup specific to 3.9.
2017-09-27 06:13:53 -04:00
Brad King ed44b56a12 FindBoost: Finish reverting "Simplify search in lists" for 3.9
In commit v3.9.2~3^2 (FindBoost: Revert "Simplify search in lists.",
2017-09-05) we forgot to also revert commit commit v3.9.1~15^2
(FindBoost: pop policy stack before returning, 2017-07-24) which had
been made as a fixup to the original commit.

Fixes: #17309
2017-09-27 06:09:21 -04:00
Kitware Robot 4d0f040aa4 CMake Nightly Date Stamp 2017-09-27 00:01:04 -04:00
Fredrik Orderud b3e6514c2a VS: Adapt project parsers to support "ProjectGUID" without curly brackets
This is needed to correctly parse Windows Installer "wiproj" projects,
that by default contain "ProjectGUID" tags with GUID values without
surrounding curly brackets.  Otherwise CMake truncates the first & last
character from the GUID value for these projects.
2017-09-26 08:56:20 -04:00