summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ninja: Fix quoting of RC language depfile in cmcldeps callBrad King2017-09-252-1/+8
| | | | | | | | | | | Since commit v3.0.0-rc1~448^2 (Ninja: use deps = gcc/msvc feature, 2013-10-18) the value of the `DEP_FILE` binding already includes the needed quoting to refer to the file. However, that commit forgot to update one of the `$DEP_FILE` references to not be quoted anymore. The offending code path currently only affects cmcldeps for RC. Remove the extra quoting now. Fixes: #17298
* Merge topic 'load_command-cleanup'Brad King2017-09-251-25/+10
|\ | | | | | | | | | | | | | | | | 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
| * cmCPluginAPI: remove explicit casts to void*Rolf Eike Beer2017-09-231-5/+4
| |
| * cmCPluginAPI: do not check pointer before calling free()Rolf Eike Beer2017-09-231-3/+1
| |
| * cmCPluginAPI: use strdup() instead of open coding itRolf Eike Beer2017-09-231-17/+5
| |
* | Merge topic 'FindOpenACC'Brad King2017-09-254-0/+259
|\ \ | | | | | | | | | | | | | | | | | | d3b6f291 FindOpenACC: Add module to detect compiler support for OpenACC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1209
| * | FindOpenACC: Add module to detect compiler support for OpenACCTin Huynh2017-09-224-0/+259
| | |
* | | Merge topic 'rc-missing-better-error'Brad King2017-09-252-32/+66
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Windows: Improve link-time error messages when rc or mt failJonathan Marler2017-09-221-32/+62
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | cmSystemTools: Teach RunSingleCommand another way to report exceptionsJonathan Marler2017-09-201-0/+4
| | | | | | | | | | | | | | | | | | | | If the caller captures stdout but not stderr then report exceptions through stdout instead of dropping them.
* | | | Merge topic 'cpackifw-options'Brad King2017-09-254-6/+77
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a24ab6b CPackIFW: Add some options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1298
| * | | | CPackIFW: Add some optionsKonstantin Podsvirov2017-09-214-6/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CPackIFW` module `cpack_ifw_configure_component` and `cpack_ifw_configure_component_group` commands gained a new `REPLACES` and `CHECKABLE` options.
* | | | | Merge topic 'cxx17-no-bind1st'Brad King2017-09-252-4/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44d3a76d Avoid using std::bind1st that is removed in C++17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1304
| * | | | | Avoid using std::bind1st that is removed in C++17Brad King2017-09-232-4/+2
| | |_|/ / | |/| | | | | | | | | | | | | Use a lambda instead now that we require C++11.
* | | | | Merge topic 'FindOpenMP-CMP0054'Brad King2017-09-251-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd5324ab FindOpenMP: Avoid CMP0054 warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1303
| * | | | | FindOpenMP: Avoid CMP0054 warningsBrad King2017-09-221-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'test-fix-msvc-standard-default'Brad King2017-09-251-13/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5dd1599 Tests: Fix RunCMake.try_compile CxxStandard case on MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1302
| * | | | | Tests: Fix RunCMake.try_compile CxxStandard case on MSVCBrad King2017-09-221-13/+31
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | CMake Nightly Date StampKitware Robot2017-09-251-1/+1
| | | | |
* | | | | Merge topic '`16839-better-tvos-support`'Craig Scott2017-09-242-1/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Xcode: Add team to compiler-id projectGregor Jasny2017-09-192-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Closes #16839
| * | | | | Xcode: Add tvOS and watchOS toolchain file supportGregor Jasny2017-09-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Issue #16839
* | | | | | CMake Nightly Date StampKitware Robot2017-09-241-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2017-09-231-1/+1
| | | | |
* | | | | Merge topic 'graphviz-link-type'Craig Scott2017-09-223-5/+107
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 5b46cc91 graphviz: distinguish target dependency types Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1229
| * | | | graphviz: distinguish target dependency typesNico Müller2017-09-213-5/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The output graph of graphviz differs now between target link types - Updated documentation - Fixes: #17192
* | | | | Merge topic 'perf-source-lookup'Brad King2017-09-225-23/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Performance: Improve efficiency of source file lookup in cmMakefileAaron Orenstein2017-09-203-3/+59
| | | | | | | | | | | | | | | | | | | | | | | | Add an unordered map to cmMakefile to speed up GetSource() lookups.
| * | | | | cmMakefile: Drop unused methodAaron Orenstein2017-09-201-1/+0
| | | | | |
| * | | | | cmSourceFileLocation: Drop unnecessary copy-assignment operatorAaron Orenstein2017-09-203-19/+7
| | |_|_|/ | |/| | | | | | | | | | | | | Update the one place that used it to avoid needing assignment.
* | | | | Merge topic 'autogen-generators-refactor'Brad King2017-09-2249-1399/+1939
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Autogen: Tests: Add a change-not test to the mocRerun testSebastian Holtermann2017-09-212-17/+36
| | | | | |
| * | | | | Autogen: Tests: Disable an AUTOMOC_DEPENDS_FILTER test for NinjaSebastian Holtermann2017-09-211-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Autogen: Tests: Refactor the QtAutogenRebuild rccDepends testSebastian Holtermann2017-09-2116-103/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactors the QtAutogenRebuild rccDepends test script to be more readable.
| * | | | | Autogen: Tests: Move each rerun test script to a NAME.cmake fileSebastian Holtermann2017-09-214-217/+224
| | | | | |
| * | | | | Autogen: Tests: Extend CMAKE_AUTOMOC_DEPEND_FILTERS rebuild testSebastian Holtermann2017-09-2112-31/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Autogen: Tests: Add <SUBDIR>/ui_view.h AUTOUIC includes to sameName testSebastian Holtermann2017-09-2113-1/+118
| | | | | |
| * | | | | Autogen: Tests: Add <SUBDIR>/item.moc includes to sameName testSebastian Holtermann2017-09-216-9/+68
| | | | | |
| * | | | | Autogen: Read relative paths from rcc outputSebastian Holtermann2017-09-211-9/+18
| | | | | |
| * | | | | Autogen: In VERBOSE mode print why files are (re)generatedSebastian Holtermann2017-09-202-44/+221
| | | | | |
| * | | | | Autogen: Refactor cmQtAutoGeneratorsSebastian Holtermann2017-09-202-1100/+1156
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'cpack-rpm-deb-version'Brad King2017-09-2219-21/+124
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74b7457f CPack RPM and DEB: improved package version handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1296
| * | | | | CPack RPM and DEB: improved package version handlingDomen Vrankar2017-09-2119-21/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for epoch version to CPackRPM and CPackDeb packagers. Also adds better version checking to CPackDeb that complies with Debian rules. Fixes: #17057
* | | | | | Merge topic 'cpack-rpm-extend-exclude-from-auto-filelist'Brad King2017-09-221-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 545d9a17 CPack/RPM: new CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST exclude paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1299
| * | | | | | CPack/RPM: new CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST exclude pathsDomen Vrankar2017-09-211-2/+6
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'variable_watch-modify-on-callback'Brad King2017-09-224-20/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | variable_watch: Made it safe to add/remove watches in access callbacksJustin Berger2017-09-212-20/+18
| | | | | | |
| * | | | | | test: Added additional unit test to variable_watchJustin Berger2017-09-212-0/+18
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This tests adding a variable_watch inside the callback to an existing callback
* | | | | | Merge topic 'string-empty'Brad King2017-09-2224-42/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37d9387b Replace empty-string comparisons with checking against `empty()`. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1275
| * | | | | | Replace empty-string comparisons with checking against `empty()`.Pavel Solodovnikov2017-09-2124-42/+43
| | | | | | |