mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,021 Commits 2 Branches 385 Tags
25978c7a00324bb4007224b562d3f29a09dc497f
Commit Graph

47021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Chevrier
25978c7a00 FindPython: ensure any specified version is correctly handled 
Fixes: #20674
 2020-05-07 11:19:36 +02:00
Brad King
6ccbf6ba71 Merge topic 'FindPkgConfig-isystem' into release-3.17 
e9d93c3731 Help: Add 3.17 release note for FindPkgConfig '-isystem' fix
dfaaae67a3 Merge branch 'backport-3.16-FindPkgConfig-isystem'
4d446c68d1 FindPkgConfig: also handle "-isystem" prefixes for include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4693
 2020-05-06 09:28:30 -04:00
Brad King
4ec59891ad Merge topic 'CheckLanguage-cuda-host' into release-3.17 
5b304a7503 CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4711
 2020-05-06 09:27:13 -04:00
Brad King
e9d93c3731 Help: Add 3.17 release note for FindPkgConfig '-isystem' fix 2020-05-06 07:46:35 -04:00
Brad King
dfaaae67a3 Merge branch 'backport-3.16-FindPkgConfig-isystem' 2020-05-06 07:45:55 -04:00
Rolf Eike Beer
4d446c68d1 FindPkgConfig: also handle "-isystem" prefixes for include directories 
Fixes: #20652
 2020-05-05 18:30:38 +02:00
Brad King
5b304a7503 CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILER 
Fix the condition added by commit fada8cbfd6 (CheckLanguage: Report
CMAKE_CUDA_HOST_COMPILER if needed for compilation, 2019-05-31,
v3.15.0-rc1~12^2) to activate CUDA-specific logic.  The old condition
had worked in our test suite only by accident because the loop variable
used in the test happened to be the name and value that the old
condition used!  Update the test to use a different name.

Fixes: #19013
 2020-05-05 09:50:29 -04:00
Brad King
2013c30c7b Merge topic 'FindBoost-1.73' into release-3.17 
a1e04be913 FindBoost: Update MinGW compiler tag for Boost 1.73

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Boris Basic <baljci@hotmail.com>
Merge-request: !4706
 2020-05-05 09:05:18 -04:00
Brad King
5ef074f726 Merge topic 'FindBoost-1.73' into release-3.17 
5e8d66f431 FindBoost: Add 1.73 to known versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4708
 2020-05-05 09:04:09 -04:00
Brad King
2bcd622080 Merge topic 'bootstrap-solaris-tr' into release-3.17 
9febdd8205 bootstrap: Use 'tr' more portably

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4703
 2020-05-05 09:02:48 -04:00
Brad King
a1e04be913 FindBoost: Update MinGW compiler tag for Boost 1.73 
Boost 1.73 on MinGW no longer uses the compiler minor version in
its library names if the major version is at least 5.

Fixes: #20673
 2020-05-04 14:05:40 -04:00
Boris Basic
5e8d66f431 FindBoost: Add 1.73 to known versions 
This was accidentally left out of commit 9daf79c53b (FindBoost: Add
support for Boost 1.73, 2020-04-19, v3.17.2~9^2).
 2020-05-04 12:13:20 -04:00
Brad King
9febdd8205 bootstrap: Use 'tr' more portably 
Since commit 380bd70cc2 (bootstrap: implement cmake_toupper() using tr,
2017-06-07, v3.10.0-rc1~548^2~2) we use `tr` to convert from lower to
upper case.  However, the character classes `[:lower:]` and `[:upper:]`
result in a "Bad string" error message on Solaris.  Use `[a-z]` and
`[A-Z]` instead.
 2020-05-04 09:41:52 -04:00
Brad King
d6f1abade4 Merge topic 'cm_cxx_features-icpc-10121' into release-3.17 
231637eae2 cm_cxx_features: Filter out 'icpc: command line warning #10121'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4698
 2020-05-01 08:24:21 -04:00
Jennifer Kathleen Green
231637eae2 cm_cxx_features: Filter out 'icpc: command line warning #10121' 
This warning appears for:

    overriding '-xCORE-AVX2' with '-march=haswell'`

in some Cray environments.

Fixes: #20664
 2020-04-30 13:27:59 -04:00
Brad King
6e16b5a759 Merge topic 'FindPython-fphsa' into release-3.17 
84bd62a6d7 FindPython: fix error on FPHSA call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4685
 2020-04-30 09:53:49 -04:00
Brad King
cf5f97d897 Merge topic 'cm_cxx_features-libhugetlbfs' into release-3.17 
4ab0d37b41 cm_cxx_features: Filter out libhugetlbfs warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4681
 2020-04-30 09:52:12 -04:00
Jennifer Green
4ab0d37b41 cm_cxx_features: Filter out libhugetlbfs warnings 
Without this, CMake fails to build on Cray systems with a
craype-hugepages modulefile loaded on the front-end due to libhugetlbfs
warnings breaking the CXX Feature tests.  Filter out the warnings so the
bootstrap can proceed to successfully install CMake on Cray Linux
systems.

Fixes: #20645
 2020-04-29 08:08:59 -04:00
Marc Chevrier
84bd62a6d7 FindPython: fix error on FPHSA call 
Fixes: #20650
 2020-04-29 12:18:54 +02:00
Brad King
615129f3eb CMake 3.17.2 v3.17.2 2020-04-28 10:23:06 -04:00
Brad King
ee1dd905c0 Merge topic 'FindBoost-1.73' into release-3.17 
69ed51960b FindBoost: Prevent warning with boost 1.73

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4662
 2020-04-28 07:14:08 -04:00
Brad King
9db6583531 Merge topic 'makefile-objc' into release-3.17 
c4d09fdc6d Makefiles: Add Objective C/C++ compilations to compile_commands.json
98aa628f0b Makefiles: Scan Objective C/C++ preprocessor dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4675
 2020-04-28 07:10:07 -04:00
Brad King
41d37e45e9 Merge topic 'pch-genex-absolute' into release-3.17 
b204bae261 target_precompile_headers: Fix documented example using genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !4678
 2020-04-28 07:09:00 -04:00
Brad King
c4d09fdc6d Makefiles: Add Objective C/C++ compilations to compile_commands.json 
Fixes: #20634
 2020-04-28 07:03:07 -04:00
Brad King
98aa628f0b Makefiles: Scan Objective C/C++ preprocessor dependencies 
Fixes: #20635
 2020-04-28 07:03:07 -04:00
Orgad Shaneh
69ed51960b FindBoost: Prevent warning with boost 1.73 
In commit 9daf79c53b (FindBoost: Add support for Boost 1.73, 2020-04-19)
we forgot to update the version comparison for the warning.
 2020-04-27 14:34:02 -04:00
Brad King
b204bae261 target_precompile_headers: Fix documented example using genex 
When the path to a header file is specified using a generator
expression, evaluation of the genex must produce an absolute path.
Update our documented example and add a test covering the case.

Fixes: #20617
 2020-04-27 14:12:41 -04:00
Brad King
354c681434 Merge topic 'FindPython-reason-failure' into release-3.17 
a7eca04163 FindPython: fix reason failure propagation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4660
 2020-04-27 10:41:20 -04:00
Marc Chevrier
a7eca04163 FindPython: fix reason failure propagation 2020-04-24 15:47:05 +02:00
Brad King
63743bda0b Merge topic 'FindPython-fix-python-compiler-validation' into release-3.17 
f39da773ee FindPython: fix python compiler validation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4655
 2020-04-24 08:36:16 -04:00
Brad King
6713b29a1e Merge topic 'ninja-order-only-fix' into release-3.17 
b45976fe10 Ninja: Remove config suffix from order-only target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4654
 2020-04-24 08:34:42 -04:00
Kyle Edwards
b45976fe10 Ninja: Remove config suffix from order-only target 
Fixes: #20621
 2020-04-23 12:46:58 -04:00
Marc Chevrier
f39da773ee FindPython: fix python compiler validation 
Ensure also the cache of properties is erased in case of multiple
searches.

Fixes: #20626, #20627
 2020-04-23 17:47:22 +02:00
Brad King
8c00f5ef0a Merge topic 'apple-merge-same-sysroot' into release-3.17 
3a7d1e9592 Apple: Merge per-arch sysroot parameters if all are the same

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4647
 2020-04-22 08:32:02 -04:00
Brad King
c4ccf23186 Merge topic 'cpack-symlinks' into release-3.17 
bcc5cd44ed CPack: Do not recurse through directory symlinks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4637
 2020-04-22 08:30:53 -04:00
Gregor Jasny
3a7d1e9592 Apple: Merge per-arch sysroot parameters if all are the same 
Since commit a9b41195d2 (Handle multi-arch sysroots on Apple platforms,
2019-07-26, v3.17.0-rc1~287^2), CMake supports "fat" builds with
different sysroots. Those are passed to the compiler with the
`-Xarch_<xyz>` parameter.

Unfortunately this breaks the Compiler Cache (ccache) because
it does not support those compiler flags:

    https://github.com/ccache/ccache/blob/v3.7.9/src/ccache.c#L2700-L2705

Restore the caching ability for certain "fat" build configurations (e.g.
`arm64` and `armv7`) where the sysroot is the same for all selected
architectures and thus a plain `-isysroot` parameter could be used.
 2020-04-21 11:18:12 -04:00
Brad King
4a5de69e09 Merge topic 'FindBoost-1.73' into release-3.17 
9daf79c53b FindBoost: Add support for Boost 1.73
f48051d33f FindBoost: Simplify Boost_VERSION_STRING comparisons
56b3375f3e BoostScanDeps: Fix typo in numpy handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4635
 2020-04-21 07:44:31 -04:00
Brad King
bcc5cd44ed CPack: Do not recurse through directory symlinks 
Extend the fix from commit 7b8dcdd173 (CPack: Do not recurse through
directory symlinks (#12284), 2011-08-27, v2.8.6~55^2) to more places in
CPack.

Issue: #12284
 2020-04-21 07:28:06 -04:00
Alexander Grund
9daf79c53b FindBoost: Add support for Boost 1.73 
Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.73.0
sources to compute dependencies.

This includes a new Boost.Nowide library.

Special case: Boost.Filesystem is an optional dependency as the include
is only required to make Boost.Filesystem use UTF-8 paths on user
request
 2020-04-20 08:27:32 -04:00
Alexander Grund
f48051d33f FindBoost: Simplify Boost_VERSION_STRING comparisons 2020-04-20 08:27:32 -04:00
Alexander Grund
56b3375f3e BoostScanDeps: Fix typo in numpy handling 
Fix a typo from commit e66e8e8914 (BoostScanDeps: Special case python
and numpy and variants, 2017-08-22, v3.10.0-rc1~229^2~1).
 2020-04-20 08:27:31 -04:00
Brad King
be88264abe Merge topic 'ninja-fortran-doc' into release-3.17 
fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4626
 2020-04-20 07:53:49 -04:00
Brad King
fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+ 
Ninja 1.10 was released in Jan 2020 and has the features we need
to support Fortran.  Replace documentation that mentions Kitware's
branch with mention of Ninja 1.10+ instead.
 2020-04-17 10:58:53 -04:00
Brad King
ee79216b82 Merge topic 'ios_multi_arch_fix' into release-3.17 
170e598add iOS: Fix detection of supported SDK architectures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexander Köplinger <alex.koeplinger@outlook.com>
Merge-request: !4615
 2020-04-17 08:07:29 -04:00
Alexandru Croitor
170e598add iOS: Fix detection of supported SDK architectures 
Instead of relying on SDKSettings.plist which does not contain the
certain architectures, deduce the supported architectures by
inspecting libSystem.tbd and libSystem.dylib.

.tbd files are text files, so just parse out the archs string.
.dylib files can be fat or non-fat, so use lipo -info to extract
the architectures and parse lipo output.

Fixes: #20588
 2020-04-16 07:51:03 -04:00
Brad King
e4aed8b9cd Merge topic 'ibmi-aix-exports' into release-3.17 
420e91c951 AIX: Activate symbol export/import IBM i (OS400)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4611
 2020-04-15 09:39:55 -04:00
Brad King
5fde1af854 Merge topic 'FindPython-if-auto-deref' into release-3.17 
894fdea2a9 FindPython: remove extra dereference
0b9c9e2c8c FindPython: avoid autoderef in version comparisons

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4610
 2020-04-15 09:38:03 -04:00
Brad King
17e6666a43 Merge topic 'FindCUDAToolkit-search-stubs' into release-3.17 
4f1e24efa0 FindCUDAToolkit searches stub location last

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4589
 2020-04-15 09:36:24 -04:00
Brad King
40e043eb98 Merge branch 'backport-3.17-file-upload-tls' into release-3.17 
Merge-request: !4579
 2020-04-15 08:57:13 -04:00
Harry Mallon
dbfece1004 file(UPLOAD): Add default ca_certs 
Default ca_certs were not added when using `UPLOAD` with built-in
(non-system) cURL.  Previously we only did this for `DOWNLOAD`.

Fixes: #20551
 2020-04-15 08:55:09 -04:00