mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,080 Commits 2 Branches 385 Tags
2c0db404d17a239aa2d549ffeaf8fb1292d4d217
Commit Graph

47080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
2c0db404d1 FindSubversion: Do not accept macOS stub without Xcode implementation 
Xcode no longer provides a `svn` implementation, but the `/usr/bin/svn`
stub may still exist.
 2020-05-28 11:37:47 -04:00
Brad King
e647949539 CMake 3.17.3 v3.17.3 2020-05-28 06:57:26 -04:00
Brad King
54eeccbfb6 Merge topic 'openssl-3.0.0' into release-3.17 
61d746e592 FindOpenSSL: Detect OpenSSL 3.0.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4805
 2020-05-28 06:51:52 -04:00
Brad King
1b8b98a884 Merge topic 'fix-cpack-deb-generating-empty-paragraph' into release-3.17 
6ba842163c CPack-deb: don't add a line with a dot to pkg desc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4806
 2020-05-28 06:50:40 -04:00
Jonathan Verner
6ba842163c CPack-deb: don't add a line with a dot to pkg desc 
Currently, if the package description ends with a newline
(typically if it is read from a file) cpack -deb adds a single line
with a dot at the end which leads to a violation of the
`extended-description-contains-empty-paragraph` debian policy.

This commit fixes the above behaviour.

Fixes: #20763
 2020-05-27 14:44:28 -04:00
Vitezslav Cizek
61d746e592 FindOpenSSL: Detect OpenSSL 3.0.0 
The OpenSSL versioning is changing with the upcoming 3.0.0 release.
https://www.openssl.org/blog/blog/2018/11/28/version/
Since 3.0.0, the patch letters are being dropped. The new format is:
MAJOR.MINOR.PATCH

The OPENSSL_VERSION variable can now be directly derived from the new
OPENSSL_VERSION_STR macro.
https://www.openssl.org/docs/manmaster/man3/OPENSSL_VERSION_NUMBER.html
 2020-05-27 09:08:10 -04:00
Brad King
6fce0cbcab Merge topic 'ctest-repeat-notrun' into release-3.17 
bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log
c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4801
 2020-05-27 08:14:21 -04:00
Brad King
6e1079dfdb Merge branch 'release-3.16' into release-3.17 2020-05-27 08:12:20 -04:00
Robert Maynard
bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log 
Issue: #20543
 2020-05-27 06:43:01 -04:00
Robert Maynard
c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT 2020-05-27 06:39:17 -04:00
Brad King
e14974a208 CMake 3.16.7 v3.16.7 2020-05-27 06:13:45 -04:00
Brad King
15e7259418 Merge topic 'doc-updates' into release-3.17 
b3e4fb5144 Help: clarify add_definitions() and add_compile_definitions() behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4786
 2020-05-25 15:50:18 -04:00
Brad King
f0ff991e42 Merge topic 'ninja-multi-install' into release-3.17 
dddb4f02f7 Ninja Multi-Config: Make "install" targets depend on default configs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4778
 2020-05-25 10:33:26 -04:00
Marc Chevrier
b3e4fb5144 Help: clarify add_definitions() and add_compile_definitions() behavior 
Fixes: #20736
 2020-05-24 12:47:24 +02:00
Kyle Edwards
dddb4f02f7 Ninja Multi-Config: Make "install" targets depend on default configs 
And add an "install:all" target.

Fixes: #20713
 2020-05-22 13:15:50 -04:00
Brad King
0781540a80 Merge topic 'cuda-default-runtime' into release-3.17 
e55b21e24e CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchain
1086e930dc CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compile
a4ea293153 Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4762
 2020-05-22 06:55:37 -04:00
Brad King
0c557a0cab Merge topic 'FindPython-debug-library-lookup' into release-3.17 
71e6854b22 FindPython: use CMAKE specific variables to look-up debug library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4764
 2020-05-21 11:36:08 -04:00
Robert Maynard
e55b21e24e CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchain 
Since commit 0d0145138f (CUDA: Add abstraction for cuda runtime
selection, 2019-11-29, v3.17.0-rc1~83^2) we add CUDA runtime library
selection flags by default.

To maintain backwards compatibility the default CUDA runtime
library needs to be computed based on what libraries are found
on the initial compiler invocation. For example a toolchain
could establish initial flags that have all CUDA compilations
using the runtime version, and if we don't detect this we will
try to link to both the static and shared runtime.

Co-Author: Brad King <brad.king@kitware.com>
Fixes: #20708
 2020-05-21 11:15:03 -04:00
Robert Maynard
1086e930dc CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compile 2020-05-20 14:36:55 -04:00
Robert Maynard
a4ea293153 Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicability 2020-05-20 14:36:55 -04:00
Brad King
1174efb6f9 Merge topic 'vs-sln-version' into release-3.17 
88ad02f1ec VS: Restore .sln support for VS Version Selector

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4765
 2020-05-20 09:03:23 -04:00
Brad King
041e57a2b0 Merge branch 'vs-sln-version' into release-3.16 
Merge-request: !4765
 2020-05-19 08:39:59 -04:00
Brad King
88ad02f1ec VS: Restore .sln support for VS Version Selector 
Since commit 3b51343ea1 (VS: Emit UTF-8 BOM for generated solution files,
2019-08-19, v3.16.0-rc1~237^2) the `.sln` file does not work with the
VS Version Selector.  Add a newline after the BOM to restore support.

Fixes: #20725
 2020-05-19 08:24:37 -04:00
Brad King
00949be941 Merge topic 'fix-ClearSourcesCache' into release-3.17 
a9f4f58f0c cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4751
 2020-05-18 12:23:40 -04:00
Marc Chevrier
71e6854b22 FindPython: use CMAKE specific variables to look-up debug library 
Fixes: #20714
 2020-05-18 15:01:26 +02:00
Brad King
4d85ad8c98 Merge topic 'backport-3.16-FindPkgConfig-isystem' into release-3.17 
3719ddd3f3 Help: Add 3.16.7 release note for FindPkgConfig '-isystem' fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4752
 2020-05-15 10:32:49 -04:00
Brad King
36599e2a7a Merge branch 'fix-ClearSourcesCache' into release-3.16 
Merge-request: !4751
 2020-05-15 09:53:05 -04:00
Brad King
481100ecbc Merge branch 'backport-3.16-FindPkgConfig-isystem' into release-3.16 
Merge-request: !4752
 2020-05-15 09:48:51 -04:00
Brad King
3719ddd3f3 Help: Add 3.16.7 release note for FindPkgConfig '-isystem' fix 
Add a release note for the change in commit 4d446c68d1 (FindPkgConfig:
also handle "-isystem" prefixes for include directories, 2020-04-30).
 2020-05-15 09:46:06 -04:00
Brad King
e6175e03c7 Merge branch 'release-3.16' into release-3.17 2020-05-15 09:44:01 -04:00
Brad King
784e665e1e Merge topic 'objc-env-vars' into release-3.17 
13ea190725 Help: Add 3.17.3 release note for Objective C/C++ compiler selection
16bf978e0c Merge branch 'backport-3.16-objc-env-vars' into objc-env-vars
67b9f55d46 Objective C/C++: Honor CC and CXX env vars to select compiler
ab9be6662f Help: Document OBJC and OBJCXX env vars for Objective C/C++ compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4746
 2020-05-15 09:15:46 -04:00
Brad King
a9f4f58f0c cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCache 
In commit 40aa6c059c (cmGeneratorTarget: Add method to collect all
sources for all configs, 2017-04-10, v3.9.0-rc1~268^2~5) we forgot to
update `ClearSourcesCache` to also clear `AllConfigSources`.  This leads
to subtle cases where code paths like PCH handling that add sources
during generation break depending on ordering.

Suggested-by: Christian Fersch
Fixes: #20712, #20702
 2020-05-15 08:26:43 -04:00
Brad King
b1a3131cc6 Merge branch 'backport-3.16-objc-env-vars' into release-3.16 2020-05-14 07:31:32 -04:00
Brad King
13ea190725 Help: Add 3.17.3 release note for Objective C/C++ compiler selection 
Port the 3.16.7 release note for 3.17.3 too.
 2020-05-14 07:28:46 -04:00
Brad King
16bf978e0c Merge branch 'backport-3.16-objc-env-vars' into objc-env-vars 2020-05-14 07:27:24 -04:00
Brad King
67b9f55d46 Objective C/C++: Honor CC and CXX env vars to select compiler 
If the `OBJC` or `OBJCXX` environment variable is not set to specify an
Objective C or C++ compiler, check `CC` or `CXX` too.

Fixes: #20703
 2020-05-14 07:17:48 -04:00
Brad King
ab9be6662f Help: Document OBJC and OBJCXX env vars for Objective C/C++ compilers 2020-05-14 07:10:06 -04:00
Brad King
b07bc05961 Merge topic 'fix-cache-args-file-to-dep-list' into release-3.17 
0199dd9f1b ExternalProject: expose _ep_cache_args_script to the caller

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4710
 2020-05-13 12:12:28 -04:00
Ben Boeckel
0199dd9f1b ExternalProject: expose _ep_cache_args_script to the caller 
This is needed so that the caller can add a dependency on the cache
file.

Fixes: #20668
 2020-05-12 10:34:23 -04:00
Brad King
44ae68d976 Merge topic 'vs-pch-compile-opts' into release-3.17 
6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4734
 2020-05-12 06:53:41 -04:00
Brad King
91dd23d3d5 Merge topic 'pch-msvc-pragma' into release-3.17 
6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4736
 2020-05-12 06:52:40 -04:00
Brad King
dc75a0728a Merge topic 'xl-cpp-install' into release-3.17 
f7a94cf282 XL: Install our Fortran 'cpp' helper script with execute permission

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4735
 2020-05-12 06:51:31 -04:00
Brad King
4b810405a4 Merge branch 'pch-msvc-pragma' into release-3.16 
Merge-request: !4736
 2020-05-11 13:34:25 -04:00
Brad King
6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above 
VS 2017 15.6 introduced support for this pragma.  Older MSVC versions
warn that it is unknown.

Fixes: #20692
 2020-05-11 13:31:15 -04:00
Brad King
f7a94cf282 XL: Install our Fortran 'cpp' helper script with execute permission 
This script was added by commit 19f267c75e (XL: Add support for Ninja
and XL Fortran, 2019-11-21, v3.17.0-rc1~368^2) but does not have a `.sh`
extension so our existing install rules neglect to give it execute
permission.  Our test suite works on XL Fortran in the build tree but
the script is broken without execute permission on installation.

Fixes: #20695
 2020-05-11 12:13:25 -04:00
Brad King
9cd0523a33 Merge branch 'vs-pch-compile-opts' into release-3.16 
Merge-request: !4734
 2020-05-11 12:03:45 -04:00
Brad King
6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS 
If a source file gets per-source flags from both PCH and custom
`COMPILE_OPTIONS`, combine them correctly.

Fixes: #20694, #20456
 2020-05-11 11:58:41 -04:00
Brad King
4de2cb4c41 Merge topic 'FindGTK2-harfbuzz-target' into release-3.17 
5ab137b7e9 FindGTK2: Add harfbuzz target for dependency from pango

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4725
 2020-05-11 10:12:14 -04:00
Brad King
68f60c073f Merge branch 'FindGTK2-harfbuzz-target' into release-3.16 
Merge-request: !4725
 2020-05-09 06:40:26 -04:00
Brad King
5ab137b7e9 FindGTK2: Add harfbuzz target for dependency from pango 
Since commit effafca77e (FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS,
2019-10-01, v3.16.0-rc1~22^2), pango's dependency on harfbuzz has been
captured, but only for the `GTK2_INCLUDE_DIRS` and `GTK2_LIBRARIES`
variables.  Add the `GTK2::harfbuzz` imported target and update the
`GTK2::pango` target to depend on it.

Issue: #19531
 2020-05-09 06:38:18 -04:00