summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | | | | cmGeneratorExpressionDAGChecker: introduce method Top()Marc Chevrier2020-04-182-48/+25
| | | | | | | | |
* | | | | | | | | Merge topic 'FindPkgConfig-frameworks'Brad King2020-04-207-88/+98
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | FindPkgConfig: fix handling of frameworksRolf Eike Beer2020-04-185-0/+90
| | | | | | | | | |
| * | | | | | | | | Tests: simplify FindPkgConfig_CMAKE_{FRAMEWORK,APPBUNDLE}_PATH testsRolf Eike Beer2020-04-182-88/+8
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests are only run on Apple platforms, so remove code for all other platforms form them.
* | | | | | | | | Merge topic 'update-kwsys'Brad King2020-04-202-7/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6ce851bef Merge branch 'upstream-KWSys' into update-kwsys 363ec4f585 KWSys 2020-04-17 (54845345) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4621
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-172-7/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-17 (54845345)
| | * | | | | | | | | KWSys 2020-04-17 (54845345)KWSys Upstream2020-04-172-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 5484534580e49723f2d5ba094697880deabf9f48 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 39fd4817 testProcess: fix another clang-tidy warning Brad King (1): b8177b56 testProcess: Disable unreliable test case 7
* | | | | | | | | | | Merge branch 'release-3.17'Brad King2020-04-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'ninja-fortran-doc' into release-3.17Brad King2020-04-202-13/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4626
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'ninja-fortran-doc'Brad King2020-04-202-13/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Merge branch 'backport-3.17-ninja-fortran-doc' into ninja-fortran-docBrad King2020-04-172-13/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Ninja: Document that Fortran support is available with Ninja 1.10+Brad King2020-04-172-13/+2
| | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-04-201-1/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge topic 'ctest-memcheck-sanitizers'Craig Scott2020-04-199-14/+39
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | CTest: Fix '-T MemCheck' command-line support for sanitizersBrad King2020-04-173-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 49948f7221 (ctest_memcheck: Add support for ThreadSanitizer, 2014-07-07, v3.1.0-rc1~322^2~1) and commit 1e005eadbc (CTest: Fix MemoryCheckType from 'ctest -T MemCheck', 2014-07-15, v3.1.0-rc1~298^2), the `CMakeCommand` internal setting was left set only when using `ctest -S` scripts. Instead simply use CTest's corresponding CMake directly without passing it through an internal setting. Fixes: #20584
| * | | | | | | | | | Tests: Fix RunCMake.ctest_memcheck test script syntax errorsBrad King2020-04-166-6/+6
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-04-191-1/+1
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'findpython-fix-indentation'Marc Chevrier2020-04-181-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62b51845db FindPython: fix some indentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4623
| * | | | | | | | | FindPython: fix some indentationBen Boeckel2020-04-171-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge topic 'add-contains-to-cmext-algorithm'Marc Chevrier2020-04-1839-186/+259
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aacd4e4a90 Refactoring: add cm::contains to <cmext/algorithm> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4606