summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2020-04-231-1/+1
|
* Merge topic 'win-user-manifest-rc'Brad King2020-04-2210-8/+87
|\ | | | | | | | | | | | | 7ca13e04fa Windows: Merge user-provided manifests into compiled resource Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4484
| * Windows: Merge user-provided manifests into compiled resourceKenney Phillis2020-04-2110-8/+87
| | | | | | | | | | | | Previously we merged user-provided manifests only into the manifest file given to the linker. Merge them into the manifest file that is compiled as a resource too.
* | Merge topic 'ctest_stop_on_failure_16628'Brad King2020-04-2217-1/+106
|\ \ | | | | | | | | | | | | | | | | | | e89aeba5c4 ctest: add option --stop-on-failure Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4630
| * | ctest: add option --stop-on-failureJohnny Jazeix2020-04-2017-1/+106
| | | | | | | | | | | | | | | | | | To stop the tests once one has failed Fixes: #16628
* | | Merge topic 'FindSquish-windows'Brad King2020-04-222-10/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c77c92791c FindSquish: Fix setting the application under test 879b279154 FindSquish: Fix launching the Squish server process on Windows 0bc4fa2be2 FindSquish: Fix finding on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4620
| * | | FindSquish: Fix setting the application under testFrederik Gladhorn2020-04-201-8/+4
| | | | | | | | | | | | | | | | | | | | The AUT (application under test) was previously set by trying to extract the target location, which is no longer supported.
| * | | FindSquish: Fix launching the Squish server process on WindowsFrederik Gladhorn2020-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | There are countless posts (e.g. stack overflow) that start /b takes a window title as first argument. Once I added a random string there the server was started and things started to work.
| * | | FindSquish: Fix finding on WindowsFrederik Gladhorn2020-04-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The whole script looks rather dated and dusty, but it actually does find newer Squish versions - e.g. version 6.5 here. I assume more work is needed, but at least with this tiny patch the path is located on Windws when the SQUISH_INSTALL_DIR environment variable is set.
* | | | Merge topic 'update-kwsys'Brad King2020-04-221-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8191d39119 Merge branch 'upstream-KWSys' into update-kwsys e833e660ef KWSys 2020-04-21 (44086372) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4646
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-211-1/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-21 (44086372)
| | * | | | KWSys 2020-04-21 (44086372)KWSys Upstream2020-04-211-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 4408637212fe1ddf09425beba97e105009734e31 (master). Upstream Shortlog ----------------- Hernan Martinez (1): 00629420 SystemInformation: Add support for Windows on ARM64
* | | | | | Merge branch 'release-3.17'Brad King2020-04-220-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge topic 'apple-merge-same-sysroot' into release-3.17Brad King2020-04-222-1/+24
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a7d1e9592 Apple: Merge per-arch sysroot parameters if all are the same Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4647
* | \ \ \ \ \ \ Merge topic 'apple-merge-same-sysroot'Brad King2020-04-222-1/+24
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a7d1e9592 Apple: Merge per-arch sysroot parameters if all are the same Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4647
| * | | | | | | Apple: Merge per-arch sysroot parameters if all are the sameGregor Jasny2020-04-212-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge branch 'release-3.17'Brad King2020-04-220-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'cpack-symlinks' into release-3.17Brad King2020-04-222-0/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcc5cd44ed CPack: Do not recurse through directory symlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4637
* | \ \ \ \ \ \ \ Merge topic 'cpack-symlinks'Brad King2020-04-222-0/+5
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcc5cd44ed CPack: Do not recurse through directory symlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4637
| * | | | | | | | CPack: Do not recurse through directory symlinksBrad King2020-04-212-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-04-221-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'external-project-mkdir-step-fix'Brad King2020-04-212-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5b33871ed ExternalProject: Fix step dependency on mkdir step Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4640
| * | | | | | | | | ExternalProject: Fix step dependency on mkdir stepVyacheslav Yurkov2020-04-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge topic 'FindMPI-msmpi-env'Brad King2020-04-211-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | faa0c62106 FindMPI: Normalize paths from MSMPI environment variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4644
| * | | | | | | | | | FindMPI: Normalize paths from MSMPI environment variablesBrad King2020-04-201-4/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20606
* | | | | | | | | | Merge topic 'test-vtk'Brad King2020-04-211-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Tests/Contracts: Update VTK release branch build configurationBrad King2020-04-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure our contract test to work with the VTK 9.0 branch.
* | | | | | | | | | | Merge topic 'refactor_cmCacheManager'Brad King2020-04-213-287/+153
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80d8b20351 cmCacheManager: Cleanup CacheIterator interface Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4628
| * | | | | | | | | | | cmCacheManager: Cleanup CacheIterator interfaceTushar Maheshwari2020-04-183-287/+153
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Expose required functionality from CacheEntry. - Modify usage in cmState member functions. - Remove cmState access to CacheEntry members.
* | | | | | | | | | | Merge topic 'nasm-with-CXX'Brad King2020-04-211-3/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3328e0a387 NASM: Fix object format when CXX is enabled but not C Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4642
| * | | | | | | | | | | NASM: Fix object format when CXX is enabled but not CChristian Feldmann2020-04-201-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check CXX data pointer size if C is not set.
* | | | | | | | | | | | Merge topic 'findpython-remove-unneeded-guard'Brad King2020-04-211-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c6ba196314 FindPython: remove unnecessary if check Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4641
| * | | | | | | | | | | | FindPython: remove unnecessary if checkBen Boeckel2020-04-201-3/+1
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `list(REMOVE_DUPLICATES)` is safe on empty lists since 3.14.
* | | | | | | | | | | | Merge topic 'ti-compilers-fix-cxx'Brad King2020-04-211-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | Compiler/TI: Fix C++ toolchain command-linesAlekseev Alexey2020-04-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | Compiler/TI: Fix linker command line for C++Alekseev Alexey2020-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just like C, libraries must be in the last part of the linker. Commit 89317915d9 (Compiler/TI: Pass libraries as last part to linker, 2016-06-02)
* | | | | | | | | | | | | Merge topic 'update-kwiml'Brad King2020-04-212-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7bfe2924f4 Merge branch 'upstream-KWIML' into update-kwiml bd202202ce KWIML 2020-04-20 (4abfeaa7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4639
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-KWIML' into update-kwimlBrad King2020-04-202-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWIML Upstream * upstream-KWIML: KWIML 2020-04-20 (4abfeaa7)
| | * | | | | | | | | | | | KWIML 2020-04-20 (4abfeaa7)KWIML Upstream2020-04-202-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge branch 'release-3.17'Brad King2020-04-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge topic 'FindBoost-1.73' into release-3.17Brad King2020-04-212-313/+336
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge topic 'FindBoost-1.73'Brad King2020-04-212-313/+336
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | / / / / | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | FindBoost: Add support for Boost 1.73Alexander Grund2020-04-202-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | FindBoost: Simplify Boost_VERSION_STRING comparisonsAlexander Grund2020-04-201-312/+314
| | | | | | | | | | | | |
| * | | | | | | | | | | | BoostScanDeps: Fix typo in numpy handlingAlexander Grund2020-04-201-1/+1
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo from commit e66e8e8914 (BoostScanDeps: Special case python and numpy and variants, 2017-08-22, v3.10.0-rc1~229^2~1).
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-04-211-1/+1
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge topic 'device-link'Brad King2020-04-20125-211/+985
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | CUDA: Device linking use now link optionsMarc Chevrier2020-04-1933-152/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | CUDA: Add information for LINKER: pattern translationMarc Chevrier2020-04-192-0/+18
| | | | | | | | | | | |
| * | | | | | | | | | | Genex: Add generator expressions $<DEVICE_LINK> and $<HOST_LINK>Marc Chevrier2020-04-1994-11/+572
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.