Commit Graph

29403 Commits

Author SHA1 Message Date
Kitware Robot
8c833ff0e1 CMake Nightly Date Stamp 2020-09-01 00:01:10 -04:00
Kitware Robot
5294febcaf CMake Nightly Date Stamp 2020-08-31 00:01:11 -04:00
Kitware Robot
e09bcd40da CMake Nightly Date Stamp 2020-08-30 00:01:07 -04:00
Kitware Robot
670672f10e CMake Nightly Date Stamp 2020-08-29 00:01:09 -04:00
Kitware Robot
c268e26d33 CMake Nightly Date Stamp 2020-08-28 00:01:25 -04:00
Brad King
86dd85d832 Merge topic 'ctest-FATAL_ERROR'
6a6f1d1edd CTest: exit nonzero after message(SEND_ERROR|FATAL_ERROR)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5154
2020-08-27 09:10:05 -04:00
Kitware Robot
e99132494b CMake Nightly Date Stamp 2020-08-27 00:01:15 -04:00
Kevin Puetz
6a6f1d1edd CTest: exit nonzero after message(SEND_ERROR|FATAL_ERROR)
Fixes: #21004
2020-08-26 11:27:05 -04:00
Brad King
efdd143459 Merge topic 'vs-win-sdk-custom-max'
ba497111f6 VS: Add option for custom Win10 SDK version maximum

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5150
2020-08-26 10:28:07 -04:00
Kitware Robot
ee70fe416f CMake Nightly Date Stamp 2020-08-26 00:02:20 -04:00
jonathan molinatto
ba497111f6 VS: Add option for custom Win10 SDK version maximum
Since commit 83ddc4d289 (VS: Do not select a Windows SDK too high for
current VS version, 2017-08-07, v3.13.0-rc1~72^2~2) we enforce a maximum
SDK version for the VS 2015 generator.  The blog post linked in the
original commit is no longer available, but it can be seen here:

* https://web.archive.org/web/20190108032520/https://blogs.msdn.microsoft.com/chuckw/2018/10/02/windows-10-october-2018-update/

In particular, it states:

> VS 2015 Users: The Windows 10 SDK (15063, 16299, 17134, 17763)
> is officially only supported for VS 2017.

However, in some circumstances a higher version can be used.

Add a `CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM` to override the
generator's default maximum SDK version.

Fixes: #20633
2020-08-25 15:27:38 -04:00
Brad King
979a5bd4d1 Merge topic 'automoc_timestamp_nmc_fix'
a48bb185c3 AutoGen: Fix moc and uic dependencies when building Qt itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5153
2020-08-25 13:58:28 -04:00
Alexandru Croitor
a48bb185c3 AutoGen: Fix moc and uic dependencies when building Qt itself
When building Qt itself, the moc and uic executables are spcecified
via a generator expression of the form $<TARGET_FILE:Qt6::moc>,
which ends populating Moc's and Uic's 'Executable' field but not the
ExecutableTarget and ExecutableTargetName fields.

In such a scenario, the code in
cmQtAutoGenInitializer::InitAutogenTarget fails to add a dependency
on moc (or uic), because ExecutableTarget is null. First try to add
a dependency on the ExecutableTarget if it's not empty, otherwise try
to add a dependency on the path specified in the 'Executable' field.

Issue: #21118
2020-08-25 12:29:23 -04:00
Brad King
5e212cafba Merge topic 'osx_asm_architectures'
940fc62962 macOS: Respect OSX_ARCHITECTURES for ASM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5152
2020-08-25 10:40:20 -04:00
Brad King
f035ddec4f Merge topic 'win32-executable-genex'
3ef0c40962 WIN32_EXECUTABLE: Add support for generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5146
2020-08-25 10:33:00 -04:00
Brad King
ea67dbc4cd Merge topic 'file_generate_target'
27a912193b file(GENERATE): Add TARGET argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5131
2020-08-25 10:31:02 -04:00
Brad King
0b0dc86eab Merge topic 'unk_imported_location'
359c500a24 cmTarget: Raise error if imported target location is not set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5113
2020-08-25 10:30:14 -04:00
Kitware Robot
d9aa99dd54 CMake Nightly Date Stamp 2020-08-25 00:01:11 -04:00
Kitware Robot
6db6913eec CMake Nightly Date Stamp 2020-08-24 00:01:17 -04:00
Kitware Robot
269d1a8624 CMake Nightly Date Stamp 2020-08-23 00:01:09 -04:00
Raul Tambre
940fc62962 macOS: Respect OSX_ARCHITECTURES for ASM
Fixes #20771.
2020-08-22 09:16:21 +03:00
Kitware Robot
08170b1b57 CMake Nightly Date Stamp 2020-08-22 00:01:14 -04:00
Kyle Edwards
3ef0c40962 WIN32_EXECUTABLE: Add support for generator expressions 2020-08-21 09:17:27 -04:00
Raul Tambre
359c500a24 cmTarget: Raise error if imported target location is not set
Previously we would synthesize <TARGET_NAME>-NOTFOUND as the location. This
would then end up on the link line and cause build failures.
Policy CMP0110 is added to control this behaviour.

Fixes #19080, #19943.
2020-08-21 08:38:39 -04:00
Kitware Robot
692bc2de94 CMake Nightly Date Stamp 2020-08-21 00:01:09 -04:00
Raul Tambre
27a912193b file(GENERATE): Add TARGET argument
Adds TARGET argument to file(GENERATE) to make resolving generator expressions
requiring a target possible.

Implements #21101, fixes #21074.
2020-08-20 17:41:52 +03:00
Brad King
aaa5eab410 CMake 3.18.2 2020-08-20 08:20:32 -04:00
Brad King
2a8f363a54 Merge topic 'fix-file-generate-cmp0070'
462b6d83e8 file(GENERATE): Test source properties
1977f7833b file(GENERATE): Update existing tests
04fbd7566a file(GENERATE): Fix missing check for policy CMP0070
2dc2732f67 file(GENERATE): Refactor outputFileName calculation
a9602bb41e file(GENERATE): Refactor inputFileName calculation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5090
2020-08-20 07:59:23 -04:00
Kitware Robot
b544a1ebec CMake Nightly Date Stamp 2020-08-20 00:01:12 -04:00
Brad King
80b9c4411b Merge topic 'ccmake-no-form-warnings'
16accdc76e ccmake: suppress warnings in third-party form code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5141
2020-08-19 11:49:18 -04:00
Brad King
cb5c8e6f25 Merge topic 'cpack-wix-custom-xmlns'
267de3ba30 CPack/WiX: Add support for custom XML namespaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5132
2020-08-19 11:48:24 -04:00
Josef Angstenberger
04fbd7566a file(GENERATE): Fix missing check for policy CMP0070
In commit 82be694c7a (file(GENERATE): Add policy CMP0070 to define
relative path behavior, 2017-06-08, v3.10.0-rc1~534^2), one path
calculation was forgotten.  Because of this the path name according to
the old behavior was added to the list of CMake generated files.

Fixes: #21038
2020-08-19 09:05:43 -04:00
Josef Angstenberger
2dc2732f67 file(GENERATE): Refactor outputFileName calculation 2020-08-19 09:03:36 -04:00
Josef Angstenberger
a9602bb41e file(GENERATE): Refactor inputFileName calculation 2020-08-19 09:03:36 -04:00
Kitware Robot
92d7249031 CMake Nightly Date Stamp 2020-08-19 00:01:29 -04:00
Brad King
16accdc76e ccmake: suppress warnings in third-party form code 2020-08-18 17:09:23 -04:00
Brad King
31b057182e Merge topic 'FixGraphvizAliasTargets'
f7dd74e4ef Graphviz: Fix bug that shows duplicated alias targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5134
2020-08-18 10:29:06 -04:00
Fritz Elfert
267de3ba30 CPack/WiX: Add support for custom XML namespaces
Add a `CPACK_WIX_CUSTOM_XMLNS` option to specify these.

Fixes: #21098
2020-08-18 07:50:49 -04:00
Kitware Robot
f6290f024c CMake Nightly Date Stamp 2020-08-18 00:01:22 -04:00
Stephan Rohmen
f7dd74e4ef Graphviz: Fix bug that shows duplicated alias targets
When using subdirectories the alias targets were duplicated
2020-08-17 21:48:47 +02:00
Brad King
fe3a404a73 Merge topic 'add_test-special-chars-in-name'
a20987732b add_test: Allow special characters in test name (w/ policy CMP0110)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5076
2020-08-17 14:58:49 -04:00
Kitware Robot
35d8543f25 CMake Nightly Date Stamp 2020-08-17 00:01:09 -04:00
Kitware Robot
39cdfa9681 CMake Nightly Date Stamp 2020-08-16 00:01:09 -04:00
Kitware Robot
de19c0c9ca CMake Nightly Date Stamp 2020-08-15 00:01:13 -04:00
Kitware Robot
c90690a2d8 CMake Nightly Date Stamp 2020-08-14 00:01:12 -04:00
Kyle Edwards
8b5aa9051b Merge topic 'optimize-static-library-deps'
2e42651dff Add option to optimize link dependencies for static libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5103
2020-08-13 14:16:25 -04:00
Kitware Robot
5748e76639 CMake Nightly Date Stamp 2020-08-13 00:01:11 -04:00
Kyle Edwards
2e42651dff Add option to optimize link dependencies for static libraries
Add an `OPTIMIZE_DEPENDENCIES` target property and supporting
`CMAKE_OPTIMIZE_DEPENDENCIES` variable to optionally enable pruning and
flattening of outgoing dependencies from static libraries.  Since they
do not actually link, they only depend on side effects of their
dependencies.  Therefore we can drop dependencies that contribute no
side effects.
2020-08-12 11:31:07 -04:00
Deniz Bahadir
a20987732b add_test: Allow special characters in test name (w/ policy CMP0110)
Restore the change from commit f84af8e270 (add_test: Allow special
characters in test name, 2020-05-16, v3.18.0-rc1~142^2) that had to be
reverted by commit f84af8e270 (add_test: Allow special characters in
test name, 2020-05-16, v3.18.0-rc1~142^2) for compatibility.

Add policy CMP0110 to make the change in a compatible way.
Also, support even more characters than before by generating the
test scripts using bracket arguments around the test names.

Fixes: #19391
Signed-off-by: Deniz Bahadir <dbahadir@benocs.com>
2020-08-12 10:44:07 -04:00
Kitware Robot
ce2cc7cfb5 CMake Nightly Date Stamp 2020-08-12 00:01:11 -04:00