Commit Graph

37394 Commits

Author SHA1 Message Date
Brad King
bb535bedc0 Merge topic 'FindOpenMP-CMP0054'
dd5324ab FindOpenMP: Avoid CMP0054 warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1303
2017-09-25 08:56:00 -04:00
Brad King
6d20eda21a Merge topic 'test-fix-msvc-standard-default'
a5dd1599 Tests: Fix RunCMake.try_compile CxxStandard case on MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1302
2017-09-25 08:55:24 -04:00
Kitware Robot
f6f1b22987 CMake Nightly Date Stamp 2017-09-25 00:01:04 -04:00
Craig Scott
c3877b892a Merge topic '16839-better-tvos-support'
45e30d12 Xcode: Add team to compiler-id project
0be0e02c Xcode: Add tvOS and watchOS toolchain file support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1278
2017-09-24 08:02:57 -04:00
Kitware Robot
e2a57a438d CMake Nightly Date Stamp 2017-09-24 00:01:03 -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
Brad King
dd5324ab1e FindOpenMP: Avoid CMP0054 warnings
When invoked in projects that don't set CMP0054 to NEW, FindOpenMP
triggers a warning:

    CMake Warning (dev) at .../Modules/FindOpenMP.cmake:... (if):
      Policy CMP0054 is not set...Quoted variables like "c" will no
      longer be dereferenced when the policy is set to NEW.  Since
      the policy is not set the OLD behavior will be used.

Set the policy within the module's scope to avoid this.

Fixes: #17292
2017-09-22 13:50:35 -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
33eec57232 Merge topic 'cpack-rpm-deb-version'
74b7457f CPack RPM and DEB: improved package version handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1296
2017-09-22 10:14:49 -04:00
Brad King
9c20ef95e0 Merge topic 'cpack-rpm-extend-exclude-from-auto-filelist'
545d9a17 CPack/RPM: new CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST exclude paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1299
2017-09-22 10:14:23 -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
Brad King
a5dd159990 Tests: Fix RunCMake.try_compile CxxStandard case on MSVC
In post-3.9 development we've taught CMake to understand C++ language
standards for MSVC.  The RunCMake.try_compile test needs to know whether
to expect support or not.  Previously we depended on the host CMake
version to know this, but CMake 3.9 and below do not.  Add special logic
to the test to account for this.
2017-09-22 09:41:07 -04:00
Kitware Robot
583d8e55ac CMake Nightly Date Stamp 2017-09-22 00:01:04 -04:00
Domen Vrankar
545d9a17e5 CPack/RPM: new CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST exclude paths
Patch adds `/usr/share/aclocal` path to exclude list and
and documents `/usr/libx32` and `/usr/include` paths that
were already on the list.

Closes: #17056
2017-09-21 20:59:13 +02: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
Domen Vrankar
74b7457f12 CPack RPM and DEB: improved package version handling
Adds support for epoch version to CPackRPM and
CPackDeb packagers.
Also adds better version checking to CPackDeb
that complies with Debian rules.

Fixes: #17057
2017-09-21 19:54:17 +02:00
Justin Berger
4c0edbd725 variable_watch: Made it safe to add/remove watches in access callbacks 2017-09-21 11:50:57 -04:00
Justin Berger
28d2c6ef7e test: Added additional unit test to variable_watch
This tests adding a variable_watch inside the callback to an existing
callback
2017-09-21 11:09:24 -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
aa8ad21ea5 Merge topic 'midipix-support'
0df43496 Midipix: Add minimal platform file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1294
2017-09-21 08:26:32 -04:00
Brad King
6f666f4335 Merge topic 'freebsd-compiler-name'
3cf3bb71 Help: Add notes for topic 'freebsd-compiler-name'
a0508dee FreeBSD prefers to call the C++ compiler c++ (just like Linux, Darwin, ..)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1293
2017-09-21 08:25:23 -04:00
Brad King
3cf3bb71f4 Help: Add notes for topic 'freebsd-compiler-name' 2017-09-21 08:24:12 -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
2c0da01c45 Merge topic 'libarchive-macos-nanosecond'
96329d5d libarchive: Do not use nanosecond file time APIs on macOS < 10.13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1295
2017-09-21 08:17:55 -04:00
Brad King
cc5600f9fd Merge topic 'test_for_missing_sources'
55ed21e7 Tests: Add tests for missing sources in add_executable and add_library.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1269
2017-09-21 08:17:18 -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
KWSys Upstream
d49b95b804 KWSys 2017-09-21 (ff912e4d)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit ff912e4d39e0a580b9d9be5430fffa46c0e1f94d (master).

Upstream Shortlog
-----------------

Brad King (1):
      aa9f3a82 macOS: Account for deployment target when checking for utimensat
2017-09-21 07:17:30 -04:00
Pavel Solodovnikov
37d9387be3 Replace empty-string comparisons with checking against empty(). 2017-09-21 11:23:19 +03:00
Sebastian Holtermann
51fd7b714b Autogen: Tests: Add a change-not test to the mocRerun test 2017-09-21 09:58:24 +02:00
Sebastian Holtermann
c8f92db72c Autogen: Tests: Disable an AUTOMOC_DEPENDS_FILTER test for Ninja
Ninja does not recognize changes in included files that are generated
by AUTOMOC on the first run. This is an open issue:

https://gitlab.kitware.com/cmake/cmake/issues/16776
2017-09-21 09:58:24 +02:00
Sebastian Holtermann
3c77515e13 Autogen: Tests: Refactor the QtAutogenRebuild rccDepends test
Refactors the QtAutogenRebuild rccDepends test script
to be more readable.
2017-09-21 09:58:24 +02:00
Sebastian Holtermann
04a0daeeed Autogen: Tests: Move each rerun test script to a NAME.cmake file 2017-09-21 09:58:24 +02:00
Sebastian Holtermann
e5c6610aba Autogen: Tests: Extend CMAKE_AUTOMOC_DEPEND_FILTERS rebuild test
The CMAKE_AUTOMOC_DEPEND_FILTERS must also detect filtered file changes
from files that are registered to AUTOMOC by a `#include "moc_<NAME>.cpp"`
statement.
2017-09-21 09:58:24 +02:00
Sebastian Holtermann
932656527b Autogen: Tests: Add <SUBDIR>/ui_view.h AUTOUIC includes to sameName test 2017-09-21 09:58:24 +02:00
Sebastian Holtermann
4eb7d81791 Autogen: Tests: Add <SUBDIR>/item.moc includes to sameName test 2017-09-21 09:58:23 +02: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
midipix
0df434967c Midipix: Add minimal platform file
Add Midipix.cmake (UnixPaths, no overrides, no special cases).
2017-09-20 14:44:30 -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