summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'GNUtoMS-vs2019'Brad King2020-01-101-1/+1
|\ | | | | | | | | | | | | 08c5b3eff0 GNUtoMS: Add search path for VS 2019 environment scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4197
| * GNUtoMS: Add search path for VS 2019 environment scriptsBrad King2020-01-091-1/+1
| | | | | | | | | | | | | | | | Extend the logic from commit abe8a623d9 (GNUtoMS: Add search path for VS 2017 environment scripts, 2017-05-19, v3.8.2~1^2) to consider VS 2019 paths too. Fixes: #20162
* | Merge branch 'release-3.16'Brad King2020-01-100-0/+0
|\ \
| * \ Merge topic 'objc-compiler-launcher' into release-3.16Brad King2020-01-1017-5/+40
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | a05b9d4239 ObjC: Add _COMPILE_LAUNCHER support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4189
* | \ \ Merge topic 'objc-compiler-launcher'Brad King2020-01-1029-5/+64
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6ef6e5a73 Merge branch 'backport-3.16-objc-compiler-launcher' 1a9f6bad98 ObjC: Add _COMPILE_LAUNCHER support a05b9d4239 ObjC: Add _COMPILE_LAUNCHER support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4189
| * \ \ \ Merge branch 'backport-3.16-objc-compiler-launcher'Brad King2020-01-090-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | ObjC: Add _COMPILE_LAUNCHER supportCristian Adam2020-01-0917-5/+40
| | | | | | | | | | | | | | | | | | | | Fixes: #20178
| * | | | ObjC: Add _COMPILE_LAUNCHER supportCristian Adam2020-01-0929-5/+64
| | | | | | | | | | | | | | | | | | | | Fixes: #20178
* | | | | Merge topic 'custom-target-FOLDER'Brad King2020-01-101-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 353405daef Add support for FOLDER target property to custom targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4193
| * | | | | Add support for FOLDER target property to custom targetsLuca Cappa2020-01-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18372
* | | | | | Merge topic 'reduce_verbosity_find_package_debug_mode'Brad King2020-01-104-17/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c92df382f find_package: Improve debug logging output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4175
| * | | | | | find_package: Improve debug logging outputRobert Maynard2020-01-014-17/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The find_package debug log messages are now easier to read when enabled by the `--debug-find` command-line option or `CMAKE_FIND_DEBUG_MODE` variable.
* | | | | | | Merge topic 'findopenssl-dependencies-link-order'Brad King2020-01-101-7/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90973c4abd FindOpenSSL: Fix ordering of dependency link flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4173
| * | | | | | | FindOpenSSL: Fix ordering of dependency link flagsAshley Whetter2019-12-311-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20082
* | | | | | | | Merge topic 'docs-autogen'Craig Scott2020-01-109-27/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 159d2ead95 Help: Mention both target and source properties for AUTO..._OPTIONS 648234b8ba Help: Clarify/add docs for initializing AUTO..._OPTIONS properties dd2f42cc84 Help: Clean up formatting and typos in autogen docs 2ec57e11fb Help: Fix sorting of property indexes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4194
| * | | | | | | | Help: Mention both target and source properties for AUTO..._OPTIONSCraig Scott2020-01-092-5/+9
| | | | | | | | |
| * | | | | | | | Help: Clarify/add docs for initializing AUTO..._OPTIONS propertiesCraig Scott2020-01-093-7/+5
| | | | | | | | |
| * | | | | | | | Help: Clean up formatting and typos in autogen docsCraig Scott2020-01-094-7/+7
| | | | | | | | |
| * | | | | | | | Help: Fix sorting of property indexesCraig Scott2020-01-091-8/+8
| | | | | | | | |
* | | | | | | | | Merge topic 'FindPython-SOABI'Marc Chevrier2020-01-106-6/+104
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61502d3956 FindPython: Add variable Python_SOABI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4190
| * | | | | | | | | FindPython: Add variable Python_SOABIMarc Chevrier2020-01-096-6/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable holds the standard extension suffix for modules. Fixes: #20150
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-101-1/+1
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-090-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'release-3.15' into release-3.16Brad King2020-01-090-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge topic 'fix-check-compiler-flag-gcc-9'Marc Chevrier2020-01-091-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b10e493ac check_LANG_compiler_flag: add the "deprecated switch" message for GCC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4165
| * | | | | | | | check_LANG_compiler_flag: add the "deprecated switch" message for GCCAlessandro Menti2019-12-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the "deprecated switch" message for GCC to CMakeCheckCompilerFlagCommonPatterns.cmake.
* | | | | | | | | Merge topic 'findlibxml2_consistent_info'Marc Chevrier2020-01-091-5/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4041cf5f61 FindLibXml2: ensure consistent paths, version and flag information Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4188
| * | | | | | | | FindLibXml2: ensure consistent paths, version and flag informationSylvain Joubert2020-01-071-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pkg-config is used as hint to perform the actual lookup of libraries and include paths we may not find the pkg-config installation. Mainly this makes sure the pkg-config information are used only if the actual installation reported to the user is the one from pkg-config. Fixes: #20149
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-091-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge topic 'modernize-memory-management'Marc Chevrier2020-01-0839-254/+293
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a00960288b GlobalGenerator family: modernize memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4181
| * | | | | | | | GlobalGenerator family: modernize memory managementMarc Chevrier2020-01-0739-254/+293
| |/ / / / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-081-1/+1
|/ / / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2020-01-071-1/+1
| | | | | | |
* | | | | | | Merge topic 'clang-format-headers-sort'Marc Chevrier2020-01-064-6/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8aa89352a clang-format: fix erroneous handling of header <queue> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4182
| * | | | | | | clang-format: fix erroneous handling of header <queue>Marc Chevrier2020-01-064-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rule Regex: '^<' was not applied to this header because a more specific one applies: Regex: '^(<|")Qt?[A-Z]' used for Qt headers (rules are not case-sensitive). So adding a specific rule for this header before the Qt rule is required.
* | | | | | | | Merge topic 'autogen_hh_headers'Kyle Edwards2020-01-0618-55/+353
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9eab3cad6a Tests: Add AUTOGEN policy CMP0100 test 8c2be3ae94 Tests: Restore Autogen/SameName .hh header test abad139c99 Autogen: Process .hh headers based on new policy CMP0100 settings 4db1463e05 Autogen: Try adding header suffix to moc output file name on name conflicts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4170
| * | | | | | | Tests: Add AUTOGEN policy CMP0100 testSebastian Holtermann2020-01-049-0/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test for policy CMP0100 that configures whether or not AUTOMOC and AUTOUIC should process .hh header files.
| * | | | | | | Tests: Restore Autogen/SameName .hh header testSebastian Holtermann2020-01-043-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 7fa7f55230fda5ac0135b1f4a220c15ad5983857, the Autogen/SameName test was changed to not test .hh header file processing in AUTOGEN anymore, because we had to revert that feature. Since we now support .hh header file processing in AUTOMOC again, we can restore the Autogen/SameName test for that.
| * | | | | | | Autogen: Process .hh headers based on new policy CMP0100 settingsSebastian Holtermann2020-01-046-41/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reintroduces .hh header processing in AUTOMOC and AUTOUIC based on the new policy CMP0100 setting. Fixes: #13904 CMAKE_AUTOMOC misses headers with ".hh" extension
| * | | | | | | Autogen: Try adding header suffix to moc output file name on name conflictsSebastian Holtermann2020-01-041-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In AUTOGEN, this changes the moc output file name computation on output name conflicts to first try to add the header suffix to the moc output base name. When that still conflicts, we try adding a range of sequential numbers. If we still can't find an unique output name, we raise an error.
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-061-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-051-1/+1
|/ / / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2020-01-041-1/+1
| | | | | | |
* | | | | | | Merge topic 'add_target_deprecation'Kyle Edwards2020-01-0315-0/+94
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c621839bd9 Add set_property option: DEPRECATION Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Daniele E. Domenichelli <ddomenichelli@drdanz.it> Merge-request: !4128
| * | | | | | | Add set_property option: DEPRECATIONJoseph Snyder2020-01-0215-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new property flag for a target which contains a message regarding deprecation status. Add a warning at "Generate" time if a linked target is marked as deprecated. Expand ExportImport test to ensure that new property is being set and passed correctly. Ensure that the message is shown during the "Generate" step run of the ExportImport test.
* | | | | | | | Merge topic 'trace-test-support-python26-and-older'Kyle Edwards2020-01-031-8/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00f25dacc0 trace: Directly parse commandline arguments without argparse Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4169
| * | | | | | | | trace: Directly parse commandline arguments without argparseDaniel Mensinger2020-01-011-8/+13
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'msvc_support_nvcc--compiler-options'Kyle Edwards2020-01-032-1/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 568298a336 CUDA: MSVC + NVCC support --compiler-options compiler flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4177
| * | | | | | | | CUDA: MSVC + NVCC support --compiler-options compiler flagRobert Maynard2020-01-022-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #20164
* | | | | | | | | Merge topic 'cmstate-std-string'Marc Chevrier2020-01-034-22/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 232d5bc333 cmState: more members will use std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4164