Commit Graph

23485 Commits

Author SHA1 Message Date
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
Kitware Robot
4d0f040aa4 CMake Nightly Date Stamp 2017-09-27 00:01:04 -04:00
Kitware Robot
ff76f89475 CMake Nightly Date Stamp 2017-09-26 00:01:22 -04:00
Brad King
1604716dfc Revert "Performance: Improve efficiency of source file lookup in cmMakefile"
This reverts commit 3b95ab5693.
It regressed some legacy source file property behavior.
Revert pending further investigation.
2017-09-25 09:06:24 -04:00
Brad King
eae3765b67 Merge topic 'load_command-cleanup'
0332ec72 cmCPluginAPI: remove explicit casts to void*
cf399036 cmCPluginAPI: do not check pointer before calling free()
6e2b1853 cmCPluginAPI: use strdup() instead of open coding it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1305
2017-09-25 09:03:12 -04:00
Brad King
7c2979a5c5 Merge topic 'rc-missing-better-error'
0a8e23ad Windows: Improve link-time error messages when rc or mt fail
c2d6835c cmSystemTools: Teach RunSingleCommand another way to report exceptions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1260
2017-09-25 09:00:16 -04:00
Brad King
62bdc587eb Merge topic 'cpackifw-options'
9a24ab6b CPackIFW: Add some options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1298
2017-09-25 08:58:25 -04:00
Brad King
f29b9702e0 Merge topic 'cxx17-no-bind1st'
44d3a76d Avoid using std::bind1st that is removed in C++17

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1304
2017-09-25 08:57:41 -04:00
Kitware Robot
f6f1b22987 CMake Nightly Date Stamp 2017-09-25 00:01:04 -04:00
Kitware Robot
e2a57a438d CMake Nightly Date Stamp 2017-09-24 00:01:03 -04:00
Rolf Eike Beer
0332ec72b2 cmCPluginAPI: remove explicit casts to void* 2017-09-23 15:30:44 +02:00
Rolf Eike Beer
cf3990365a cmCPluginAPI: do not check pointer before calling free() 2017-09-23 15:30:44 +02:00
Rolf Eike Beer
6e2b18535b cmCPluginAPI: use strdup() instead of open coding it 2017-09-23 15:30:44 +02:00
Brad King
44d3a76d4a Avoid using std::bind1st that is removed in C++17
Use a lambda instead now that we require C++11.
2017-09-23 06:49:48 -04:00
Kitware Robot
7a7e96e278 CMake Nightly Date Stamp 2017-09-23 00:01:07 -04:00
Craig Scott
de5dd4f4fa Merge topic 'graphviz-link-type'
5b46cc91 graphviz: distinguish target dependency types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1229
2017-09-22 18:28:59 -04:00
Jonathan Marler
0a8e23ad6e Windows: Improve link-time error messages when rc or mt fail
We run extra tools during linking on Windows to deal with manifests.
Report more information when these tools fail.  For example, if the
Windows SDK is not installed with VS then `rc.exe` will be missing.
2017-09-22 13:57:08 -04:00
Brad King
4609aaf513 Merge topic 'perf-source-lookup'
3b95ab56 Performance: Improve efficiency of source file lookup in cmMakefile
e0188803 cmMakefile: Drop unused method
fe1e811b cmSourceFileLocation: Drop unnecessary copy-assignment operator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1154
2017-09-22 10:17:49 -04:00
Brad King
7df7eea7cf Merge topic 'autogen-generators-refactor'
51fd7b71 Autogen: Tests: Add a change-not test to the mocRerun test
c8f92db7 Autogen: Tests: Disable an AUTOMOC_DEPENDS_FILTER test for Ninja
3c77515e Autogen: Tests: Refactor the QtAutogenRebuild rccDepends test
04a0daee Autogen: Tests: Move each rerun test script to a NAME.cmake file
e5c6610a Autogen: Tests: Extend CMAKE_AUTOMOC_DEPEND_FILTERS rebuild test
93265652 Autogen: Tests: Add <SUBDIR>/ui_view.h AUTOUIC includes to sameName test
4eb7d817 Autogen: Tests: Add <SUBDIR>/item.moc includes to sameName test
3f223743 Autogen: Read relative paths from rcc output
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1244
2017-09-22 10:15:54 -04:00
Brad King
a6f2ea6ada Merge topic 'variable_watch-modify-on-callback'
4c0edbd7 variable_watch: Made it safe to add/remove watches in access callbacks
28d2c6ef test: Added additional unit test to variable_watch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1284
2017-09-22 10:12:48 -04:00
Brad King
00389afa34 Merge topic 'string-empty'
37d9387b Replace empty-string comparisons with checking against `empty()`.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1275
2017-09-22 10:11:23 -04:00
Kitware Robot
583d8e55ac CMake Nightly Date Stamp 2017-09-22 00:01:04 -04:00
Nico Müller
5b46cc91d9 graphviz: distinguish target dependency types
- The output graph of graphviz differs now between target link types
- Updated documentation
- Fixes: #17192
2017-09-21 20:49:44 +02:00
Konstantin Podsvirov
9a24ab6b63 CPackIFW: Add some options
The `CPackIFW` module `cpack_ifw_configure_component` and
`cpack_ifw_configure_component_group` commands gained a new
`REPLACES` and `CHECKABLE` options.
2017-09-21 21:34:33 +03:00
Justin Berger
4c0edbd725 variable_watch: Made it safe to add/remove watches in access callbacks 2017-09-21 11:50:57 -04:00
Brad King
46f7a6707b Merge topic 'update-kwsys'
ff0ddff7 Merge branch 'upstream-KWSys' into update-kwsys
d49b95b8 KWSys 2017-09-21 (ff912e4d)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1297
2017-09-21 08:30:55 -04:00
Brad King
5737bb3756 Merge topic 'cpack-different-checksum-file-per-generator'
b06870e5 CPack: use a distinct checksum file for each generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1291
2017-09-21 08:19:52 -04:00
Brad King
5c5b28dd9d Merge topic 'cpack-check-install-script'
09166339 CPack: Add missing check for CPACK_INSTALL_SCRIPT variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1090
2017-09-21 08:19:11 -04:00
Brad King
ff0ddff785 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-09-21 (ff912e4d)
2017-09-21 07:17:36 -04:00
Pavel Solodovnikov
37d9387be3 Replace empty-string comparisons with checking against empty(). 2017-09-21 11:23:19 +03:00
Sebastian Holtermann
3f22374339 Autogen: Read relative paths from rcc output 2017-09-21 09:58:23 +02:00
Kitware Robot
1cf9437517 CMake Nightly Date Stamp 2017-09-21 00:01:03 -04:00
Sebastian Holtermann
8bee55bce1 Autogen: In VERBOSE mode print why files are (re)generated 2017-09-20 23:21:01 +02:00
Sebastian Holtermann
15346bec19 Autogen: Refactor cmQtAutoGenerators
The refactoring of cmQtAutoGenerators serializes the program flow and
makes it less jumpy in terms of function calling.
Instead of keeping and passing multiple std::vectors and std::maps in
function arguments, single lists with job descriptions are used,
one job list for MOC, UIC, RCC respectively.
Several utility functions and methods were replaced with scoped lambdas
and the remaining methods were sorted by their scope (MOC, UIC, RCC).

Error and warning messages were refactored to be more verbose
about the problem at hand.

The source parsing algorithms were rewritten in large parts.
In the process a lack of functionality of CMAKE_AUTOMOC_DEPEND_FILTERS
was discovered and fixed. CMAKE_AUTOMOC_DEPEND_FILTERS did not extract
dependency file names from headers that were not in the target sources
but were registered to AUTOMOC by a `#include "moc_<NAME>.cpp"` statement.
A test for this use case is provided in a follow up commit.
2017-09-20 23:21:01 +02:00
Jonathan Marler
c2d6835c17 cmSystemTools: Teach RunSingleCommand another way to report exceptions
If the caller captures stdout but not stderr then report exceptions
through stdout instead of dropping them.
2017-09-20 14:17:13 -04:00
Aaron Orenstein
3b95ab5693 Performance: Improve efficiency of source file lookup in cmMakefile
Add an unordered map to cmMakefile to speed up GetSource() lookups.
2017-09-20 14:10:47 -04:00
Aaron Orenstein
e018880350 cmMakefile: Drop unused method 2017-09-20 14:10:45 -04:00
Aaron Orenstein
fe1e811b4f cmSourceFileLocation: Drop unnecessary copy-assignment operator
Update the one place that used it to avoid needing assignment.
2017-09-20 14:10:44 -04:00
Domen Vrankar
b06870e5ff CPack: use a distinct checksum file for each generator
Different CPack generators could produce checksum files with the same
name which were overwritten by each other since only package name
without extensions was used for checksum file name generation.  This
patch adds package extension to checksum files to prevent collisions.

Fixes: #16840
2017-09-20 14:01:23 -04:00
Alex Turbov
091663395e CPack: Add missing check for CPACK_INSTALL_SCRIPT variable
Also add a test case that uses CPACK_INSTALL_SCRIPT.

Co-Author: Domen Vrankar <domen.vrankar@gmail.com>
Fixes: #15005
2017-09-20 13:33:22 -04:00
Brad King
95df03a1d4 Merge topic 'CTest-cov-string'
062776e7 CTest: pass std::string to cmCTestCoverageHandler::ShouldIDoCoverage()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1290
2017-09-20 13:21:58 -04:00
Brad King
1490466bf9 Merge topic 'ninja-performance'
7374cb85 Ninja: Cache ConvertToNinjaPath results to avoid repeat work
ed19e813 Ninja: Improve performance with deeply-dependent custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1217
2017-09-20 13:20:46 -04:00
Brad King
be475daa8f Merge topic 'tidy-modernize-loop-convert'
706b37b7 Enable clang-tidy modernize-loop-convert lint

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1287
2017-09-20 13:18:28 -04:00
Brad King
cb36e91eff Merge topic 'cxx11-nullptr'
a5279ae5 Use C++11 nullptr (cont.)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1283
2017-09-20 13:17:25 -04:00
Brad King
c8826fe04f Merge topic 'cxx-checks-tolerate-unused-flag'
71b65abc C++ feature checks: Filter out warnings caused by user flags
eb3abf8b C++ feature checks: Prepare for multiple check output filters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1286
2017-09-20 13:16:11 -04:00
Brad King
4f971e700a Merge topic 'CTest-crash-missing-glob'
6db63012 CTest: fix crash if source file for coverage cannot be found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1289
2017-09-20 07:46:09 -04:00
Kitware Robot
33ead73d73 CMake Nightly Date Stamp 2017-09-20 00:01:05 -04:00
Matthias Maennich
a5279ae553 Use C++11 nullptr (cont.)
Fix remaining occurrences of the issue addressed in commit 5962db4389
(Use C++11 nullptr, 2017-08-22) that are only showing up on macOS.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-19 11:44:21 -04:00
Rolf Eike Beer
062776e75b CTest: pass std::string to cmCTestCoverageHandler::ShouldIDoCoverage()
Avoid needless conversion back and forth.
2017-09-19 17:41:41 +02:00
Rolf Eike Beer
6db6301205 CTest: fix crash if source file for coverage cannot be found
The opened XML elements were not closed, so an assert was triggered when the
file was finally closed. If CMake is built with assertions disabled then an
invalid XML file will be produced.
2017-09-19 17:37:29 +02:00