Commit Graph

41791 Commits

Author SHA1 Message Date
Brad King
c84fe1e71f Merge topic 'sort1'
20b7826e14 Help: correct alphabetical sorting of lines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2784
2019-01-11 07:45:07 -05:00
Brad King
9143627c93 Merge topic 'doc-roff-fix'
9922e70b1a Help: Prevent .so from being treated as a roff macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2756
2019-01-11 07:43:57 -05:00
Brad King
003759ba0d Merge topic 'threads'
5a5a1d90f0 Help: FindThreads not needed with modern C++.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2776
2019-01-11 07:42:54 -05:00
Kitware Robot
ac0b59ef01 CMake Nightly Date Stamp 2019-01-11 00:01:05 -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
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
Craig Scott
5b7eb38e8e Merge topic 'fix-warn-uninitialized-in-configure'
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
2019-01-07 15:33:52 -05:00
Craig Scott
6f904d0100 Merge topic 'nmake-compile-commands'
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
2019-01-07 15:26:55 -05:00
Tobias Hunger
9045f6a30f Autogen: Prepare for Qt 6
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.
2019-01-07 14:13:10 +01:00
Kitware Robot
c1e9b1c283 CMake Nightly Date Stamp 2019-01-07 00:01:06 -05:00
Craig Scott
99a0a6d816 Merge topic 'bundle_fixes'
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
2019-01-06 15:05:32 -05:00
Kitware Robot
d3e0e65de3 CMake Nightly Date Stamp 2019-01-06 00:01:04 -05:00
Kitware Robot
662ab10bc2 CMake Nightly Date Stamp 2019-01-05 00:01:05 -05:00
Alexander Grund
08be74bfd7 GetPrerequisites: Fix handling of executable scripts
Fixes: #18667
2019-01-05 09:09:39 +11:00