Commit Graph
47352 Commits
Author SHA1 Message Date
Kyle Edwards b4444d6054 Tests: Split CPack DEB and RPM tests into smaller tests
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.
2019-01-10 13:56:35 -05:00
Kyle Edwards 450131cc0e Tests: Add infrastructure to split up large CPack tests
This allows CPack generator tests to be split into smaller tests of
the format "<generator>.<test>".
2019-01-10 13:56:35 -05:00
Rechi Rechi 971d490e5b curl: do not disable IPv6 support
Allow curl's detection of IPv6 to proceed when building in CMake.
2019-01-10 13:54:25 -05:00
Raf Czlonka 9922e70b1a Help: Prevent .so from being treated as a roff macro
Move `.so` to the line above - otherwise it is being treated as a `roff`
macro, i.e.:

    $ mandoc -Tlint /usr/local/man/man7/cmake-properties.7 | head -n 3
    mandoc: /usr/local/man/man7/cmake-properties.7:1131:2: WARNING: .so is fragile, better use ln(1): so libraries.
    mandoc: /usr/local/man/man7/cmake-properties.7: ERROR: No such file or directory
    mandoc: /usr/local/man/man7/cmake-properties.7:1131:15: ERROR: .so request failed: .so libraries.

and causes other issues down the line.
2019-01-10 13:38:51 -05:00
Robert Maynard 5000fed5af FindBISON: Add policy CMP0088 to run bison in build tree 2019-01-10 13:23:14 -05:00
Wil Stark 5e4887e673 VS: Honor WinCE deployment properties in VS 2010+
Previously only VS 2008 was supported.
2019-01-10 13:06:25 -05:00
Wil Stark a4332cac4b Tests: Detect VS and SDK availability early 2019-01-10 12:49:51 -05:00
Sebastian Holtermann 5ae69f5919 Autogen: Issue a warning when AUTOMOC/UIC/RCC gets disabled.
We used to silently disable AUTOMOC/UIC/RCC when no valid Qt
version was found.  This patch introduces the generation of
a warning message in that case.

Closes #18732.
2019-01-10 16:48:28 +01:00
Joachim Wuttke (o) bfc3670546 Help: Provide cross-references from and to set_property 2019-01-10 16:13:18 +01:00
Brad King b91f6f39f7 VS: Track explicitly when platform is specified in generator name 2019-01-10 09:38:35 -05:00
Brad King 89cc3d432b VS: Move platform name members to top-level global generator
We no longer support any VS versions that pre-date support for
multiple platforms (target architectures).
2019-01-10 09:38:35 -05:00
Brad King 40a732800d VS: Clarify global generator constructor interface
Make the constructors protected since they should be produced through
factories.  Also rename `platform{ => InGenerator}Name` to clarify
the meaning of the argument.
2019-01-10 09:38:35 -05:00
Brad King 5ca7e5057b Help: Document VS generator default platform selection 2019-01-10 09:38:35 -05:00
Brad King 6092a770f6 Merge topic 'vs-refactor'
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
2019-01-10 09:38:14 -05:00
Brad King 143fbde17b Merge topic 'ctest-show-as-json'
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
2019-01-10 09:37:25 -05:00
Brad King 18ca9d0820 Merge branch 'release-3.13' 2019-01-10 09:36:20 -05:00
Brad King dd71b683e5 Merge topic 'cmake-CDU-option-parsing'
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
2019-01-10 09:35:40 -05:00
Brad King 91fa6a472c Merge branch 'cmake-CDU-option-parsing' into release-3.13
Merge-request: !2783
2019-01-10 09:34:14 -05:00
Brad King a1b3d79f72 Merge topic 'autogen-qt6'
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
2019-01-10 09:33:48 -05:00
Tobias Hunger cd32886b2f Autogen: Add AUTO(MOC|RCC|UIC)_EXECUTABLE target properties
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.
2019-01-10 08:03:24 -05:00
Brad King ecf3c5c6f3 Merge topic 'fix-msvc-warnings'
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
2019-01-10 08:00:44 -05:00
Brad King 49b3ebf5f5 Merge topic 'better_sphinx_colors'
db89590f36 Help: CMakeTemplateStyle uses colors that better contrast.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2779
2019-01-10 07:55:46 -05:00
Brad King 163cc8bbdd VS: Convert WriteSLNHeader to non-virtual lookup table 2019-01-10 07:52:51 -05:00
Brad King 6d99406e69 VS: Move ExpressEdition member to top-level generator
We no longer support any VS versions that pre-date introduction of
express editions.
2019-01-10 07:52:49 -05:00
Brad King 03f74a16cd VS: Convert GetIDEVersion to non-virtual table lookup 2019-01-10 07:52:48 -05:00
Brad King d07f453f39 VS: Convert GetToolsVersion to non-virtual table lookup 2019-01-10 07:51:47 -05:00
Brad King 67209a9291 Tests: Add cases for ctest --show-only=json-v1 2019-01-10 07:37:35 -05:00
Justin Goshi fc41a95f08 CTest: Add --show-only[=format] option to print test info
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.
2019-01-10 07:37:32 -05:00
Joachim Wuttke (o) 20b7826e14 Help: correct alphabetical sorting of lines 2019-01-10 12:58:59 +01:00
Brad King 2ec3363ea5 Tests: Add cases for -{C,D,U} without a source tree 2019-01-10 21:19:26 +11:00
Paul Seyfert 6d53a60f00 cmake: distinguish '-Cpath' from '-C path' in source dir parsing
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.
2019-01-10 21:19:24 +11:00
Kitware Robot f2a78aeed9 CMake Nightly Date Stamp 2019-01-10 00:01:04 -05:00
Craig Scott d085403f72 Merge branch 'release-3.13' 2019-01-10 08:43:09 +11:00
Craig Scott 1fe3d126a5 Merge topic 'BundleUtilities-make-dir'
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
2019-01-09 16:41:38 -05:00
Craig Scott 88c710ab56 Merge branch 'feature/fix-link_resolved_item_into_bundle' into release-3.13
Merge-request: !2728
2019-01-10 08:39:33 +11:00
Robert Maynard db89590f36 Help: CMakeTemplateStyle uses colors that better contrast. 2019-01-09 15:53:26 -05:00
Brad King 757737075a VS: Remove unused MSBuild XML parsing script
It has been superseded by `cmConvertMSBuildXMLToJSON.py`.
2019-01-09 14:38:12 -05:00
Brad King 5395c526fc cmake: Drop unused table entry for selecting default generator
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.
2019-01-09 11:31:55 -05:00
Bruno Manganelli 5bcfe98bd5 Source: Fix various compiler warnings in Visual Studio 2017 2019-01-09 08:25:10 -05:00
Brad King c9854a5843 Merge branch 'release-3.13' 2019-01-09 08:19:56 -05:00
Brad King 90b08fc27b Merge topic 'vs2017-skip-2019'
d44f81c217 VS: Exclude VS 2019 instances when using VS 2017 generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2775
2019-01-09 08:13:02 -05:00
Joachim Wuttke (o) 5a5a1d90f0 Help: FindThreads not needed with modern C++. 2019-01-09 11:03:44 +01:00
Kitware Robot 98103e38d0 CMake Nightly Date Stamp 2019-01-09 00:01:04 -05:00
Brad King 68bc9fcbb9 Merge branch 'vs2017-skip-2019' into release-3.13
Merge-request: !2775
2019-01-08 14:13:33 -05:00
Brad King d44f81c217 VS: Exclude VS 2019 instances when using VS 2017 generator
Filter instances reported by the VS Installer to consider only VS 2017
instances for the "Visual Studio 15 2017" generator.

Fixes: #18721
2019-01-08 14:10:16 -05:00
Justin Goshi 7b81d8c21e TestGenerator: Record support file and line where test was added
Add internal test properties that ctest can use to report where
the test was added in CMake code.
2019-01-08 11:22:11 -05:00
Brad King 00530d74d5 Tests: Pass python interpreter into RunCMake.CTestCommandLine
This will be useful for adding python-based result checks.
2019-01-08 11:22:11 -05:00
Kyle Edwards 6a796b57b2 Merge topic 'modernize-for'
1cf9c754db Source: Modernize for loops, add const modifiers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2765
2019-01-08 09:55:47 -05:00
Tim Blechmann 200bf57742 BundleUtilities: Ensure target dir exists when creating symlinks
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
2019-01-08 19:56:34 +11:00
Kitware Robot f5da1bb349 CMake Nightly Date Stamp 2019-01-08 00:01:05 -05:00