mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 22:31:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
47,822 Commits 2 Branches 401 Tags
60831cfb226d680bac4edaa580b801cd86e0e89d
Commit Graph

47822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 60831cfb22 Merge branch 'release-3.17' 2020-04-22 08:32:02 -04:00
Brad King 5a57cec2f4 Merge topic 'apple-merge-same-sysroot' 
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 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 a9ea232e46 Merge branch 'release-3.17' 2020-04-22 08:30:53 -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
Brad King fb5d24fa3c Merge topic 'cpack-symlinks' 
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
Kitware Robot 8a8ebcdd70 CMake Nightly Date Stamp 2020-04-22 00:01:17 -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 a583360d10 Merge topic 'external-project-mkdir-step-fix' 
e5b33871ed ExternalProject: Fix step dependency on mkdir step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4640
 2020-04-21 08:21:46 -04:00
Brad King a0cf159b9b Merge topic 'FindMPI-msmpi-env' 
faa0c62106 FindMPI: Normalize paths from MSMPI environment variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4644
 2020-04-21 08:20:48 -04:00
Brad King d56c96e967 Merge topic 'test-vtk' 
cc56bf89d9 Tests/Contracts: Update VTK release branch build configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4638
 2020-04-21 08:19:45 -04:00
Brad King 9ebf3a62b6 Merge topic 'refactor_cmCacheManager' 
80d8b20351 cmCacheManager: Cleanup CacheIterator interface

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4628
 2020-04-21 08:18:47 -04:00
Brad King 22d2354ec5 Merge topic 'nasm-with-CXX' 
3328e0a387 NASM: Fix object format when CXX is enabled but not C

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4642
 2020-04-21 08:17:43 -04:00
Brad King cd957389f2 Merge topic 'findpython-remove-unneeded-guard' 
c6ba196314 FindPython: remove unnecessary if check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4641
 2020-04-21 08:16:39 -04:00
Brad King dba914aa31 Merge topic 'ti-compilers-fix-cxx' 
65c1320719 Compiler/TI: Fix C++ toolchain command-lines
4110d9dffb Compiler/TI: Fix linker command line for C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4627
 2020-04-21 08:15:31 -04:00
Brad King e608a6ef20 Merge topic 'update-kwiml' 
7bfe2924f4 Merge branch 'upstream-KWIML' into update-kwiml
bd202202ce KWIML 2020-04-20 (4abfeaa7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4639
 2020-04-21 08:14:26 -04:00
Brad King c02d2a4b21 Merge branch 'release-3.17' 2020-04-21 07:44:32 -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 3465ae916f Merge topic 'FindBoost-1.73' 
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
Kitware Robot 441a5f73c0 CMake Nightly Date Stamp 2020-04-21 00:01:15 -04:00
Brad King faa0c62106 FindMPI: Normalize paths from MSMPI environment variables 
Fixes: #20606
 2020-04-20 13:39:06 -04:00
Vyacheslav Yurkov e5b33871ed ExternalProject: Fix step dependency on mkdir step 
When looking at `list(FIND)` result, zero index is ignored due to
incorrect error handling, and users can't set dependencies on mkdir
step.

Fixes: #20605
 2020-04-20 18:49:17 +02:00
Brad King cc56bf89d9 Tests/Contracts: Update VTK release branch build configuration 
Configure our contract test to work with the VTK 9.0 branch.
 2020-04-20 12:46:51 -04:00
Christian Feldmann 3328e0a387 NASM: Fix object format when CXX is enabled but not C 
Check CXX data pointer size if C is not set.
 2020-04-20 11:07:30 -04:00
Ben Boeckel c6ba196314 FindPython: remove unnecessary if check 
`list(REMOVE_DUPLICATES)` is safe on empty lists since 3.14.
 2020-04-20 10:30:09 -04:00
Brad King 7bfe2924f4 Merge branch 'upstream-KWIML' into update-kwiml 
# By KWIML Upstream
* upstream-KWIML:
  KWIML 2020-04-20 (4abfeaa7)
 2020-04-20 08:42:21 -04:00
KWIML Upstream bd202202ce KWIML 2020-04-20 (4abfeaa7) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwiml.git

at commit 4abfeaa780c5107013f264c0517107b48b43bba4 (master).

Upstream Shortlog
-----------------

Ben Boeckel (1):
      a079afc6 cmake: don't set the minimum version

Hernan Martinez (1):
      4abfeaa7 abi.h: Add pointer size and endianess for Windows on ARM64
 2020-04-20 08:42:21 -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 5d32699975 Merge topic 'device-link' 
4248bb452a CUDA: Device linking use now link options
ec48e023f6 CUDA: Add information for LINKER: pattern translation
3fdae5acaa Genex: Add generator expressions $<DEVICE_LINK> and $<HOST_LINK>
38332fc4fa cmGeneratorExpressionDAGChecker: introduce method Top()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4577
 2020-04-20 08:14:16 -04:00
Brad King a0a861b27f Merge topic 'FindPkgConfig-frameworks' 
95ead38375 FindPkgConfig: fix handling of frameworks
b7304f35b3 Tests: simplify FindPkgConfig_CMAKE_{FRAMEWORK,APPBUNDLE}_PATH tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3814
 2020-04-20 08:09:57 -04:00
Brad King ab61ee1b5b Merge topic 'update-kwsys' 
b6ce851bef Merge branch 'upstream-KWSys' into update-kwsys
363ec4f585 KWSys 2020-04-17 (54845345)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4621
 2020-04-20 08:03:55 -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 cd307fb303 Merge branch 'release-3.17' 2020-04-20 07:53:49 -04:00
Brad King aae1efc7d2 Merge topic 'ninja-fortran-doc' 
f2fa7d20b2 Merge branch 'backport-3.17-ninja-fortran-doc' into ninja-fortran-doc
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
Kitware Robot 04e05550bb CMake Nightly Date Stamp 2020-04-20 00:01:34 -04:00
Marc Chevrier 4248bb452a CUDA: Device linking use now link options 
properties LINK_OPTIONS and INTERFACE_LINK_OPTIONS are propagated
to the device link step.

To control which options are selected for normal link and device link steps,
the $<DEVICE_LINK> and $<HOST_LINK> generator expressions can be used.

Fixes: #18265
 2020-04-19 15:53:11 +02:00
Marc Chevrier ec48e023f6 CUDA: Add information for LINKER: pattern translation 2020-04-19 15:04:56 +02:00
Marc Chevrier 3fdae5acaa Genex: Add generator expressions $<DEVICE_LINK> and $<HOST_LINK> 
These generator expressions can only be used in link options properties.
These expressions return the arguments respectively for device and host link
step, otherwise return an empty string.
 2020-04-19 15:04:54 +02:00
Craig Scott 348a2a9734 Merge topic 'ctest-memcheck-sanitizers' 
e03d3c08f0 CTest: Fix '-T MemCheck' command-line support for sanitizers
82b6091776 Tests: Fix RunCMake.ctest_memcheck test script syntax errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4618
 2020-04-19 07:07:13 -04:00
Kitware Robot 53b773113d CMake Nightly Date Stamp 2020-04-19 00:01:15 -04:00
Rolf Eike Beer 95ead38375 FindPkgConfig: fix handling of frameworks 2020-04-18 17:14:56 +02:00
Rolf Eike Beer b7304f35b3 Tests: simplify FindPkgConfig_CMAKE_{FRAMEWORK,APPBUNDLE}_PATH tests 
These tests are only run on Apple platforms, so remove code for all other
platforms form them.
 2020-04-18 15:26:02 +02:00
Tushar Maheshwari 80d8b20351 cmCacheManager: Cleanup CacheIterator interface 
- Expose required functionality from CacheEntry.
- Modify usage in cmState member functions.
- Remove cmState access to CacheEntry members.
 2020-04-18 18:35:57 +05:30
Marc Chevrier df2d39bc51 Merge topic 'findpython-fix-indentation' 
62b51845db FindPython: fix some indentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4623
 2020-04-18 05:43:26 -04:00
Marc Chevrier 38332fc4fa cmGeneratorExpressionDAGChecker: introduce method Top() 2020-04-18 11:29:43 +02:00
Marc Chevrier 40d1735681 Merge topic 'add-contains-to-cmext-algorithm' 
aacd4e4a90 Refactoring: add cm::contains to <cmext/algorithm>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4606
 2020-04-18 05:27:52 -04:00
Alekseev Alexey 65c1320719 Compiler/TI: Fix C++ toolchain command-lines 
Applied commit 5a0fc68312 (TI: Fix C toolchain command-lines, 2020-03-03) for C++:
Fix `armar` arguments.  Fix the linker `--map_file=` argument.
Enable response files.
 2020-04-18 12:12:20 +03:00