Commit Graph

41832 Commits

Author SHA1 Message Date
Brad King
9e03a63ba8 Merge topic 'drop-IRIX'
beb991110d Remove now-unused code once used on IRIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2791
2019-01-14 09:15:10 -05:00
Brad King
e91f1616d9 Merge topic 'cpplint-no-output-no-warning'
c834c47dfc cpplint: only print diagnostics to console if there are errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2788
2019-01-14 09:14:17 -05:00
Brad King
3e763d506c Merge branch 'release-3.13' 2019-01-14 09:02:41 -05:00
Brad King
8887ebc69b CMake 3.13.3 v3.13.3 2019-01-14 07:27:44 -05:00
Brad King
848dc85187 Merge branch 'release-3.13' 2019-01-14 07:26:12 -05:00
Brad King
1f411b0cfa Merge topic 'cmake-option-parsing'
27eb7c5bdb cmake: Ensure source and binary dirs are set
a1adbc7243 cmake: Stop processing if -P option lacks file name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2799
2019-01-14 07:25:46 -05:00
Brad King
c63a19e920 Merge branch 'cmake-option-parsing' into release-3.13
Merge-request: !2799
2019-01-14 07:24:36 -05:00
Brad King
6a23e16ec2 Merge topic 'autogen_noqt_warning'
0377fe1e2b Merge branch 'backport-autogen_noqt_warning' into autogen_noqt_warning
dd39da5518 Tests: Add case for warning when AUTOMOC/UIC/RCC gets disabled
f44a0414ae Autogen: Issue a warning when AUTOMOC/UIC/RCC gets disabled.
5ae69f5919 Autogen: Issue a warning when AUTOMOC/UIC/RCC gets disabled.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2787
2019-01-14 06:51:42 -05:00
Kitware Robot
dd90811bbf CMake Nightly Date Stamp 2019-01-14 00:01:04 -05:00
Craig Scott
27eb7c5bdb cmake: Ensure source and binary dirs are set
If only the source dir is provided, the binary dir is assumed
to be the working directory. If only the binary dir is provided
and it doesn't yet have a CMakeCache.txt to provide the
source dir, then the source dir is assumed to be the working
directory. This logic was not previously being handled
correctly when -S and/or -B options were involved.
Furthermore, when both were missing, no suitable error
message was provided and an empty string was used for
the build directory.

Fixes: #18707
2019-01-14 07:13:28 +11:00
Craig Scott
a1adbc7243 cmake: Stop processing if -P option lacks file name
While an error message was being logged, processing was
continuing nonetheless except with the -P argument omitted.
This could have allowed unintended effects if the remaining
arguments formed a valid set of command line options.
2019-01-14 07:13:27 +11:00
Kitware Robot
310054ac23 CMake Nightly Date Stamp 2019-01-13 00:01:04 -05:00
Kitware Robot
c459beaf60 CMake Nightly Date Stamp 2019-01-12 00:01:06 -05:00
Brad King
beb991110d Remove now-unused code once used on IRIX
We dropped support for IRIX as a host platform long ago.
Remove some leftover code.
2019-01-11 13:50:46 -05:00
jasjuang
c834c47dfc cpplint: only print diagnostics to console if there are errors
Fixes: #18781
2019-01-11 12:56:51 -05:00
Brad King
ddb5b097cd Merge branch 'backport-autogen_noqt_warning' into release-3.13
Merge-request: !2787
2019-01-11 11:25:59 -05:00
Brad King
5a283b79e5 Merge topic 'vs-refactor'
b91f6f39f7 VS: Track explicitly when platform is specified in generator name
89cc3d432b VS: Move platform name members to top-level global generator
40a732800d VS: Clarify global generator constructor interface
5ca7e5057b Help: Document VS generator default platform selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2786
2019-01-11 10:36:03 -05:00
Brad King
73aca0572b Merge topic 'vs_ce_support'
5e4887e673 VS: Honor WinCE deployment properties in VS 2010+
a4332cac4b Tests: Detect VS and SDK availability early

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2680
2019-01-11 10:06:58 -05:00
Brad King
0377fe1e2b Merge branch 'backport-autogen_noqt_warning' into autogen_noqt_warning 2019-01-11 08:41:51 -05:00
Brad King
dd39da5518 Tests: Add case for warning when AUTOMOC/UIC/RCC gets disabled 2019-01-11 08:28:42 -05:00
Brad King
696c6afcaf Merge topic 'FindBoost-1.70'
266808c413 FindBoost: Add support for Boost 1.70

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2747
2019-01-11 08:00:45 -05:00
Brad King
f15345be41 Merge topic 'FindICE-more-exe'
fbb115d198 FindIce: Find slice2confluence and slice2matlab executables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2773
2019-01-11 07:56:11 -05:00
Brad King
5951c676e6 Merge topic 'cpack-deb-rpm-split'
b4444d6054 Tests: Split CPack DEB and RPM tests into smaller tests
450131cc0e Tests: Add infrastructure to split up large CPack tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2742
2019-01-11 07:55:27 -05:00
Brad King
283c93fe9a Merge topic 'xl-early-bE'
74720a298c XL: Move '-bE' flag earlier so it can be overridden

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2771
2019-01-11 07:52:53 -05:00
Brad King
9e8f2e509f Merge topic 'bison_target_policy'
5000fed5af FindBISON: Add policy CMP0088 to run bison in build tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2774
2019-01-11 07:52:05 -05:00
Brad King
60666e2cd3 Merge topic 'fix-doc-typo'
261ae28ccd Help: fix typo for CTEST_CUSTOM_TESTS_IGNORE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2770
2019-01-11 07:46:16 -05:00
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
jspam
fbb115d198 FindIce: Find slice2confluence and slice2matlab executables 2019-01-10 14:36:10 -05:00
Rob Boehne
74720a298c XL: Move '-bE' flag earlier so it can be overridden
By default, we generate an export list for a shared library and pass
that file on the link line.  The problem was that it could not be
overridden by a target when a specific export file is being used.
Multiple `-bE` flags on the link are overridden by subsequent `-bE`
flags, so only the last one is used.

Fixes: #13282
2019-01-10 14:25:06 -05:00
Sebastian Holtermann
f44a0414ae 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.
2019-01-10 14:05:33 -05:00
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
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
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