summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindBoost-1.73' into release-3.17Brad King2020-04-281-1/+1
|\ | | | | | | | | | | | | 69ed51960b FindBoost: Prevent warning with boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4662
| * FindBoost: Prevent warning with boost 1.73Orgad Shaneh2020-04-271-1/+1
| | | | | | | | | | In commit 9daf79c53b (FindBoost: Add support for Boost 1.73, 2020-04-19) we forgot to update the version comparison for the warning.
* | Merge topic 'makefile-objc' into release-3.17Brad King2020-04-282-3/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | Makefiles: Add Objective C/C++ compilations to compile_commands.jsonBrad King2020-04-281-2/+3
| | | | | | | | | | | | Fixes: #20634
| * | Makefiles: Scan Objective C/C++ preprocessor dependenciesBrad King2020-04-281-1/+1
| | | | | | | | | | | | Fixes: #20635
* | | Merge topic 'pch-genex-absolute' into release-3.17Brad King2020-04-285-16/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | target_precompile_headers: Fix documented example using genexBrad King2020-04-275-16/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'FindPython-reason-failure' into release-3.17Brad King2020-04-271-21/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a7eca04163 FindPython: fix reason failure propagation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4660
| * | | FindPython: fix reason failure propagationMarc Chevrier2020-04-241-21/+23
|/ / /
* | | Merge topic 'FindPython-fix-python-compiler-validation' into release-3.17Brad King2020-04-245-19/+129
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f39da773ee FindPython: fix python compiler validation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4655
| * | | FindPython: fix python compiler validationMarc Chevrier2020-04-235-19/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure also the cache of properties is erased in case of multiple searches. Fixes: #20626, #20627
* | | | Merge topic 'ninja-order-only-fix' into release-3.17Brad King2020-04-245-6/+36
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | b45976fe10 Ninja: Remove config suffix from order-only target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4654
| * | | Ninja: Remove config suffix from order-only targetKyle Edwards2020-04-235-6/+36
|/ / / | | | | | | | | | Fixes: #20621
* | | 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
| * | | 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 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
| * | | 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
* | | | 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
| * | | 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).
* | | 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
| * | | 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.
* | | Merge topic 'ios_multi_arch_fix' into release-3.17Brad King2020-04-171-11/+76
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | iOS: Fix detection of supported SDK architecturesAlexandru Croitor2020-04-161-11/+76
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'ibmi-aix-exports' into release-3.17Brad King2020-04-151-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 420e91c951 AIX: Activate symbol export/import IBM i (OS400) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4611
| * | | AIX: Activate symbol export/import IBM i (OS400)Brad King2020-04-141-2/+5
| | |/ | |/| | | | | | | Fixes: #20582
* | | Merge topic 'FindPython-if-auto-deref' into release-3.17Brad King2020-04-151-9/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 894fdea2a9 FindPython: remove extra dereference 0b9c9e2c8c FindPython: avoid autoderef in version comparisons Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4610
| * | | FindPython: remove extra dereferenceBen Boeckel2020-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | If the version is not found (e.g., missing headers), this causes a CMake error about `if(blah VERSION_EQUAL)` being an invalid statement.
| * | | FindPython: avoid autoderef in version comparisonsBen Boeckel2020-04-141-8/+8
| | |/ | |/|
* | | Merge topic 'FindCUDAToolkit-search-stubs' into release-3.17Brad King2020-04-151-2/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4f1e24efa0 FindCUDAToolkit searches stub location last Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4589
| * | | FindCUDAToolkit searches stub location lastRobert Maynard2020-04-141-2/+20
| | | | | | | | | | | | | | | | Fixes #20252
* | | | Merge branch 'backport-3.17-file-upload-tls' into release-3.17Brad King2020-04-151-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !4579
| * | | | file(UPLOAD): Add default ca_certsHarry Mallon2020-04-151-0/+7
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Default ca_certs were not added when using `UPLOAD` with built-in (non-system) cURL. Previously we only did this for `DOWNLOAD`. Fixes: #20551
* | | | Merge topic 'FindMPI-pgi-spectrum-mpi-wrappers' into release-3.17Brad King2020-04-131-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd449c6175 FindMPI: Add the pgi compiler wrapper names used by IBM Spectrum MPI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4598
| * | | | FindMPI: Add the pgi compiler wrapper names used by IBM Spectrum MPIChuck Atkins2020-04-101-3/+3
| | |_|/ | |/| |
* | | | Merge branch 'release-3.16' into release-3.17Brad King2020-04-130-0/+0
|\ \ \ \ | |/ / /
| * | | CMake 3.16.6v3.16.6Brad King2020-04-101-1/+1
| | | |
| * | | Merge branch 'doc-3.15-std-fix' into release-3.16Brad King2020-04-061-0/+9
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !4574
| * \ \ \ Merge branch 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.16Brad King2020-04-011-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !4557
| * \ \ \ \ Merge branch 'backport-3.16-link-libs-config-case' into release-3.16Brad King2020-03-305-5/+30
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4544
| * \ \ \ \ \ Merge branch 'aix-ExportImportList-install' into release-3.16Brad King2020-03-301-0/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4545
| * \ \ \ \ \ \ Merge branch 'make-nested-silent' into release-3.16Brad King2020-03-261-1/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4515
| * \ \ \ \ \ \ \ Merge branch 'GetPrerequisites-vcruntime-is-system' into release-3.16Brad King2020-03-191-3/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4506
| * \ \ \ \ \ \ \ \ Merge branch 'swift-link-line-spaces' into release-3.16Brad King2020-03-121-3/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4469
| * \ \ \ \ \ \ \ \ \ Merge branch 'ibmi-fix-libuv-build' into release-3.16Brad King2020-03-061-0/+19
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4431
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cmstd-IBM-i' into release-3.16Brad King2020-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4430
* | \ \ \ \ \ \ \ \ \ \ \ Merge topic 'docs-CMAKE_CURRENT_FUNCTION' into release-3.17Craig Scott2020-04-115-25/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10ee9611f0 Help: Improve wording of CMAKE_CURRENT_FUNCTION_LIST_DIR docs 22fbc404a7 Help: Add cross-references for CMAKE_CURRENT_FUNCTION* docs d2b139687a Help: Minor grammar cleanups of CMAKE_CURRENT_FUNCTION* docs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !4595
| * | | | | | | | | | | | | Help: Improve wording of CMAKE_CURRENT_FUNCTION_LIST_DIR docsCraig Scott2020-04-101-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original wording was somewhat confusing in talking about rendering of templates. While technically correct, a less experienced user may not know that terminology. The wording has been updated to more clearly describe the example usage. The old way of implementing the example is not "bad", it was the only way to do things before the CMAKE_CURRENT_FUNCTION_LIST_DIR variable was added. The example has been updated to remove the Bad/Good captions to reflect this. Indentation of the examples was also fixed to make them conform to the guidelines.
| * | | | | | | | | | | | | Help: Add cross-references for CMAKE_CURRENT_FUNCTION* docsCraig Scott2020-04-103-0/+12
| | | | | | | | | | | | | |