summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2017-08-171-1/+1
|
* Merge topic 'lint-fixes'Brad King2017-08-161-2/+2
|\ | | | | | | | | | | | | | | cbcf6458 cmServerProtocol: Do not move into json::Value::append() 91417e4c cmServerProtocol: pass cmBacktraceRange by value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1143
| * cmServerProtocol: Do not move into json::Value::append()Daniel Pfeifer2017-08-151-1/+1
| | | | | | | | | | | | | | CMake's copy of json-cpp is not aware of rvalues yet. It is confusing to pass the result of std::move to a function that takes a const& because no move will actually happen. This change may be reverted once CMake upgrades to a new version of json-cpp.
| * cmServerProtocol: pass cmBacktraceRange by valueDaniel Pfeifer2017-08-151-1/+1
| |
* | Merge topic 'string_prepend'Brad King2017-08-162-0/+28
|\ \ | | | | | | | | | | | | | | | | | | d8ecc254 Add PREPEND sub-command to string command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1129
| * | Add PREPEND sub-command to string commandSylvain Joubert2017-08-112-0/+28
| | |
* | | Merge topic 'autogen-autouic-lookup'Brad King2017-08-162-21/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c5e03d6 Merge branch 'backport-autogen-autouic-lookup' into autogen-autouic-lookup fb5db079 Autogen: Extend AUTOUIC search paths test d8a99dd2 Autogen: Update AUTOUIC documentation for search paths 02e6c548 Autogen: Restore AUTOUIC lookup paths from 3.8.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1140
| * \ \ Merge branch 'backport-autogen-autouic-lookup' into autogen-autouic-lookupBrad King2017-08-152-21/+51
| |\ \ \ | | |_|/ | |/| |
| | * | Autogen: Restore AUTOUIC lookup paths from 3.8.2Sebastian Holtermann2017-08-152-21/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When encountering an `#include "<PATH>ui_<BASE>.h"` statement, search for `<BASE>.ui` in - <SOURCE_DIR>/<BASE>.ui - <SOURCE_DIR>/<PATH><BASE>.ui - <AUTOUIC_SEARCH_PATH>/<BASE>.ui - <AUTOUIC_SEARCH_PATH>/<PATH><BASE>.ui In CMake 3.8.2 the lookup list was - <SOURCE_DIR>/<BASE>.ui In CMake 3.9.[01] the lookup list was - <SOURCE_DIR>/<PATH><BASE.ui> - <AUTOUIC_SEARCH_PATH>/<PATH><BASE>.ui Closes #17168
| | * | CMake 3.9.1v3.9.1Brad King2017-08-101-1/+1
| | | |
| | * | Merge branch 'find-package_root-disable' into release-3.9Brad King2017-08-104-0/+14
| | |\ \ | | | | | | | | | | | | | | | Merge-request: !1116
* | | | | CMake Nightly Date StampKitware Robot2017-08-161-1/+1
|/ / / /
* | | | Merge topic 'server-allow-cache'Brad King2017-08-151-11/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b3c5ccf Server: test cache after reconnect 1df38758 cmServerProtocol: allow 'cache' request before 'configure' 187332b2 cmServerProtocol: fix test of empty values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !977
| * | | | cmServerProtocol: allow 'cache' request before 'configure'Daniel Pfeifer2017-08-131-4/+0
| | | | | | | | | | | | | | | | | | | | Fixes: #16989
| * | | | cmServerProtocol: fix test of empty valuesDaniel Pfeifer2017-08-131-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a required value is in the cache, it is not necessary to set it explicitly. Fixes: #16948, #16988
* | | | | Merge topic 'autogen-less-verbose'Brad King2017-08-151-6/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53640a46 Autogen: Only print Qt Autogenerator messages when verbose Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1133
| * | | | | Autogen: Only print Qt Autogenerator messages when verboseMatthias Kuhn2017-08-121-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unconditionally printing these messages prevents ninja builds from filtering successful commands and only show errors and warnings. Fix #17157
* | | | | | Merge topic 'update-kwsys'Brad King2017-08-155-40/+159
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 060cef0c Merge branch 'upstream-KWSys' into update-kwsys 9e002621 KWSys 2017-08-11 (e1006189) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1130
| * | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-08-115-40/+159
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-08-11 (e1006189)
* | | | | | Merge topic 'cpackifw-package-file-extension'Brad King2017-08-152-12/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45623e72 CPackIFW: Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !1117
| * | | | | | CPackIFW: Add CPACK_IFW_PACKAGE_FILE_EXTENSION variableKonstantin Podsvirov2017-08-092-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable to customize target binary format.
* | | | | | | CMake Nightly Date StampKitware Robot2017-08-151-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-08-141-1/+1
| |_|/ / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-08-131-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-08-121-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'libuv-required'Brad King2017-08-112-12/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88c9878a Make libuv available to all parts of CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1104
| * | | | | Make libuv available to all parts of CMakeBrad King2017-08-082-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libuv library provides many useful platform abstractions and better process management than KWSys. We'd like to use it everywhere instead of just in the server mode. Drop the `CMAKE_USE_LIBUV` option and use libuv everywhere except during bootstrap.
* | | | | | Merge topic 'autogen-merge-redundant'Brad King2017-08-115-46/+53
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15ef2728 Autogen: Add test for OBJECT libraries 362f9bd7 Autogen: Merge and remove redundant function calls 952fc65d Autogen: Clear sources meta data cache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1120
| * | | | | | Autogen: Merge and remove redundant function callsSebastian Holtermann2017-08-103-44/+34
| | | | | | |
| * | | | | | Autogen: Clear sources meta data cacheSebastian Holtermann2017-08-103-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds cmGeneratorTarget::clearSourcesCache() which clears the cache of precomputed sources lists and object names. The cache gets recomputed on demand. Clearing the cache is necessary in case an OBJECT library gets a source added after a target (ORIGIN) that includes it computed it's external sources cache. This may happen in AUTOMOC when ORIGIN is processed before the OBJECT library which gets a mocs_compilation.cpp file added. Closes #17152 Closes #17139 Closes #17085 Closes #15967
* | | | | | | Merge topic 'genex-COMPILE_FEATURES-stds'Brad King2017-08-111-0/+12
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f7d9eef Features: Fix COMPILE_FEATURES genex for C++ 14 and 17 features Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1118
| * | | | | | Features: Fix COMPILE_FEATURES genex for C++ 14 and 17 featuresBrad King2017-08-081-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `CXX_STANDARD` is not at least 14 or 17, features enabled by the compiler for those standards should not be reported as existing by the `COMPILE_FEATURES` genex. Fix the implementation and add a test.
* | | | | | | CMake Nightly Date StampKitware Robot2017-08-111-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'find-package_root-disable'Brad King2017-08-104-0/+14
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 578d95f8 find_*: Disable the PACKAGE_ROOT search path group for CMake 3.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1116
| * | | | | find_*: Disable the PACKAGE_ROOT search path group for CMake 3.9Brad King2017-08-084-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the feature added by commit v3.9.0-rc1~71^2~2 (find_*: Add a new PackageRoot search path group, 2017-05-03) and remove documentation added by commit v3.9.0-rc1~71^2 (find_*: Add docs for PackageRoot search path group, 2017-05-03). Unfortunately the name `<pkg>_ROOT` may already be set by projects for their own incompatible purposes. Disable the behavior change for now to fix the regression for CMake 3.9. We can restore it later with a policy. In order to keep the implementation and tests working, add an undocumented variable we can use in the tests to enable the behavior before the policy is introduced. Fixes: #17144
* | | | | | Merge topic 'autogen-create-include-dir'Brad King2017-08-101-0/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a0605c7 Autogen: Always create AUTOMOC/AUTOUIC include directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1113
| * | | | | Autogen: Always create AUTOMOC/AUTOUIC include directorySebastian Holtermann2017-08-081-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The **AUTOGEN** include directory was always passed to the compiler but only generated on demand. To avoid compiler complaints when using `-Wmissing-include-dirs` make sure the directory gets created always. Closes #17147
| * | | | | Merge branch 'add-package_root-to-find_package' into release-3.9Brad King2017-08-032-0/+21
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Merge-request: !1082
| * | | | | Merge branch 'vs-VCTargetsPath-force-config' into release-3.9Brad King2017-08-031-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1100
* | | | | | | CMake Nightly Date StampKitware Robot2017-08-101-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-08-091-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'ctest-launch-match-details'Brad King2017-08-081-1/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 1c61d240 CTest: Report lines matched by launchers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1084
| * | | | CTest: Report lines matched by launchersBill Hoffman2017-08-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since launchers show the entire stderr/stdout for a command and only skip it if all of the lines are suppressed, it can be hard to tell if individual suppressions are working. Mark up the output reported to CDash with a prefix for each line indicating whether it was a matched or suppressed warning. Lines that are suppressed are prefixed with `[CTest: warning suppressed]` and lines that match the warning expression are prefixed with `[CTest: warning matched]`. This should make it easier for people to add suppressions as they will know what they need to match and what they have already suppressed. This is an issue because if there is more than one warning in a single compiler output you have to suppress all of them before it will go away.
* | | | | CMake Nightly Date StampKitware Robot2017-08-081-1/+1
| | | | |
* | | | | Merge topic 'autogen-configs'Brad King2017-08-072-69/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5150c352 Autogen: Add release notes for per-config include dir ccc98b5c Autogen: Update documentation for per-config include dir a13716a5 Autogen: Enable per-config support 6d83757f Autogen: Generate rcc wrapper file on demand 74a1b8eb Autogen: Fix configuration suffix initialization ddd6f0db Autogen: Add per-config suffix to moc_predefs.h e2c9cf12 Autogen: Remove per-config suffix for mocs_compilations.cpp 3a4840e0 Autogen: Make test per-config include directory compatible Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1107
| * | | | | Autogen: Enable per-config supportSebastian Holtermann2017-08-051-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables the AUTOGEN per-config include directories and wrapper sources for multi configuration generators. Closes #16460
| * | | | | Autogen: Generate rcc wrapper file on demandSebastian Holtermann2017-08-052-20/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For multi configuration generators remove per-config qrc_FOO_$<CONFIG>.cpp source file support. Instead use a single source file qrc_FOO.cpp which is a wrapper that includes the actual rcc generated qrc_FOO_CONFIG.cpp file. This way, after a repeated configuration change, only the wrapper file qrc_FOO.cpp must be regenerated to include the appropriate qrc_FOO_CONFIG.cpp file.
| * | | | | Autogen: Fix configuration suffix initializationSebastian Holtermann2017-08-052-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | The configuration suffix was used before it was initialized.
| * | | | | Autogen: Add per-config suffix to moc_predefs.hSebastian Holtermann2017-08-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moc_predefs.h is generated using per-config -D definitions and therefore must be configuration specific as well.
| * | | | | Autogen: Remove per-config suffix for mocs_compilations.cppSebastian Holtermann2017-08-052-29/+9
| | | | | |