summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Split CPack DEB and RPM tests into smaller testsKyle Edwards2019-01-105-31/+77
| | | | | | | | The DEB and RPM tests are quite large, which can result in CTest clients timing out on these tests even though they're working properly. The RPM test in particular causes a lot of timeouts on the CMake dashboard machines. This change splits these tests into smaller tests so that they don't time out.
* Tests: Add infrastructure to split up large CPack testsKyle Edwards2019-01-102-18/+24
| | | | | This allows CPack generator tests to be split into smaller tests of the format "<generator>.<test>".
* Merge topic 'vs-refactor'Brad King2019-01-1020-449/+100
|\ | | | | | | | | | | | | | | | | | | | | | | 163cc8bbdd VS: Convert WriteSLNHeader to non-virtual lookup table 6d99406e69 VS: Move ExpressEdition member to top-level generator 03f74a16cd VS: Convert GetIDEVersion to non-virtual table lookup d07f453f39 VS: Convert GetToolsVersion to non-virtual table lookup 757737075a VS: Remove unused MSBuild XML parsing script 5395c526fc cmake: Drop unused table entry for selecting default generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2780
| * VS: Convert WriteSLNHeader to non-virtual lookup tableBrad King2019-01-1017-81/+54
| |
| * VS: Move ExpressEdition member to top-level generatorBrad King2019-01-102-4/+4
| | | | | | | | | | We no longer support any VS versions that pre-date introduction of express editions.
| * VS: Convert GetIDEVersion to non-virtual table lookupBrad King2019-01-109-12/+20
| |
| * VS: Convert GetToolsVersion to non-virtual table lookupBrad King2019-01-105-10/+22
| |
| * VS: Remove unused MSBuild XML parsing scriptBrad King2019-01-091-341/+0
| | | | | | | | It has been superseded by `cmConvertMSBuildXMLToJSON.py`.
| * cmake: Drop unused table entry for selecting default generatorBrad King2019-01-091-1/+0
| | | | | | | | | | | | In `cmake::CreateDefaultGlobalGenerator` the table of registry entries does not need an entry for VS 2017 because that is found via the VS setup helper.
* | Merge topic 'ctest-show-as-json'Brad King2019-01-1016-20/+683
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67209a9291 Tests: Add cases for ctest --show-only=json-v1 fc41a95f08 CTest: Add --show-only[=format] option to print test info 7b81d8c21e TestGenerator: Record support file and line where test was added 00530d74d5 Tests: Pass python interpreter into RunCMake.CTestCommandLine Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !2499
| * | Tests: Add cases for ctest --show-only=json-v1Brad King2019-01-103-0/+159
| | |
| * | CTest: Add --show-only[=format] option to print test infoJustin Goshi2019-01-108-2/+448
| | | | | | | | | | | | | | | | | | format can be 'human' to print the current text format or 'json-v1' to print the test object model in json format and is useful for IDEs who want to gather information about the tests. Defaults to 'human' format.
| * | TestGenerator: Record support file and line where test was addedJustin Goshi2019-01-084-17/+74
| | | | | | | | | | | | | | | Add internal test properties that ctest can use to report where the test was added in CMake code.
| * | Tests: Pass python interpreter into RunCMake.CTestCommandLineBrad King2019-01-081-1/+2
| | | | | | | | | | | | This will be useful for adding python-based result checks.
* | | Merge branch 'release-3.13'Brad King2019-01-100-0/+0
|\ \ \
| * \ \ Merge branch 'cmake-CDU-option-parsing' into release-3.13Brad King2019-01-1013-1/+37
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2783
* | \ \ \ Merge topic 'cmake-CDU-option-parsing'Brad King2019-01-100-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ec3363ea5 Tests: Add cases for -{C,D,U} without a source tree 6d53a60f00 cmake: distinguish '-Cpath' from '-C path' in source dir parsing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2783
| * | | | Tests: Add cases for -{C,D,U} without a source treeBrad King2019-01-1012-1/+22
| | | | |
| * | | | cmake: distinguish '-Cpath' from '-C path' in source dir parsingPaul Seyfert2019-01-101-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This results in the correct source directory being picked up in calls with cmake sourcedir -C settings and in a more appropriate error message when calling mkdir build ; cd build ; cmake -C settings Also fix `-D` and `-U` in the same way.
* | | | | Merge topic 'autogen-qt6'Brad King2019-01-1010-24/+141
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd32886b2f Autogen: Add AUTO(MOC|RCC|UIC)_EXECUTABLE target properties 9045f6a30f Autogen: Prepare for Qt 6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2679
| * | | | | Autogen: Add AUTO(MOC|RCC|UIC)_EXECUTABLE target propertiesTobias Hunger2019-01-1010-18/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to force moc/rcc/uic compiler used for AUTO(MOC|RCC|UIC). Setting these properties is only necessary if you are going to do strange things like build these tools as part of your own build system. Setting these properties will also prevent cmake from testing the binary: It is user-provided and assumed to be valid.
| * | | | | Autogen: Prepare for Qt 6Tobias Hunger2019-01-072-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle Qt version > 5 in Qt AutoGen. This patch does *NOT* include tests and documentation: There is no Qt 6 yet. I still need this patch to work on a cmake based build system for Qt 6.
* | | | | | Merge topic 'fix-msvc-warnings'Brad King2019-01-105-4/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5bcfe98bd5 Source: Fix various compiler warnings in Visual Studio 2017 70e245f19e cmAlgorithms: add utility functions to get signed size of containers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2757
| * | | | | | Source: Fix various compiler warnings in Visual Studio 2017Bruno Manganelli2019-01-094-4/+4
| | | | | | |
| * | | | | | cmAlgorithms: add utility functions to get signed size of containersBruno Manganelli2018-12-271-0/+6
| | | | | | |
* | | | | | | Merge topic 'better_sphinx_colors'Brad King2019-01-101-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db89590f36 Help: CMakeTemplateStyle uses colors that better contrast. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2779
| * | | | | | | Help: CMakeTemplateStyle uses colors that better contrast.Robert Maynard2019-01-091-5/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-01-101-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.13'Craig Scott2019-01-090-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'feature/fix-link_resolved_item_into_bundle' into release-3.13Craig Scott2019-01-091-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Merge-request: !2728
* | \ \ \ \ \ \ Merge topic 'BundleUtilities-make-dir'Craig Scott2019-01-091-0/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 200bf57742 BundleUtilities: Ensure target dir exists when creating symlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Craig Scott <craig.scott@crascit.com> Merge-request: !2728
| * | | | | | BundleUtilities: Ensure target dir exists when creating symlinksTim Blechmann2019-01-081-0/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.13.0-rc1~279^2 (GetPrerequisites: Move dylibs from MacOS to Frameworks folder in bundle, 2018-07-22) introduced a regression that can cause symlink creation to fail during packaging. Symlinks can be created before targets are installed, so the destination directory of the symlink sometimes won't exist at symlink creation. Fixes: #18726
* | | | | | Merge branch 'release-3.13'Brad King2019-01-090-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'vs2017-skip-2019' into release-3.13Brad King2019-01-081-0/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Merge-request: !2775
* | | | | | Merge topic 'vs2017-skip-2019'Brad King2019-01-091-0/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d44f81c217 VS: Exclude VS 2019 instances when using VS 2017 generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2775
| * | | | | VS: Exclude VS 2019 instances when using VS 2017 generatorBrad King2019-01-081-0/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter instances reported by the VS Installer to consider only VS 2017 instances for the "Visual Studio 15 2017" generator. Fixes: #18721
* | | | | CMake Nightly Date StampKitware Robot2019-01-091-1/+1
| | | | |
* | | | | Merge topic 'modernize-for'Kyle Edwards2019-01-084-30/+23
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 1cf9c754db Source: Modernize for loops, add const modifiers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2765
| * | | | Source: Modernize for loops, add const modifiersVitaly Stakhovsky2018-12-314-30/+23
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-01-081-1/+1
| | | | |
* | | | | Merge topic 'fix-warn-uninitialized-in-configure'Craig Scott2019-01-077-58/+118
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbf0c0fce4 cmake: Enable --warn-uninitialized inside string(CONFIGURE) and configure_file 1d32a35c10 cmCommandArgumentParserHelper: use cmMakefile::MaybeWarnUninitialized 67ac4ed1dc cmMakefile: Move uninitialized vars logic into MaybeWarnUninitialized() 5257af3634 cmMakefile: move common logic to IsProjectFile function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2676
| * | | | | cmake: Enable --warn-uninitialized inside string(CONFIGURE) and configure_fileArtur Ryt2018-12-296-16/+88
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18489
| * | | | | cmCommandArgumentParserHelper: use cmMakefile::MaybeWarnUninitializedArtur Ryt2018-12-292-22/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It removes logic duplication and need to have cached WarnUninitialized and CheckSystemVars
| * | | | | cmMakefile: Move uninitialized vars logic into MaybeWarnUninitialized()Artur Ryt2018-12-282-12/+20
| | | | | |
| * | | | | cmMakefile: move common logic to IsProjectFile functionArtur Ryt2018-12-282-10/+11
| | | | | |
* | | | | | Merge topic 'nmake-compile-commands'Craig Scott2019-01-072-3/+26
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37c6a02dc2 CMake: fix nmake compile_commands generation 7583f7490e cmGlobalGenerator: Teach EscapeJSON to escape newlines and tabs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2648
| * | | | | CMake: fix nmake compile_commands generationYan Pashkovsky2018-12-141-0/+11
| | | | | |
| * | | | | cmGlobalGenerator: Teach EscapeJSON to escape newlines and tabsYan Pashkovsky2018-12-141-3/+15
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-01-071-1/+1
| | | | | |
* | | | | | Merge topic 'bundle_fixes'Craig Scott2019-01-068-13/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08be74bfd7 GetPrerequisites: Fix handling of executable scripts 52445300d6 GetPrerequisites: Allow prefixed tools 1bac4678ea GetPrerequisites: Add GET_PREREQUISITES_VERBOSE to set verbose 5072598f07 BundleUtilites: Don't use hardcoded name for install_name_tool 428680da92 GetPrerequisites: Don't use hardcoded name for otool Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2748