summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Help: Minor grammar cleanups of CMAKE_CURRENT_FUNCTION* docsCraig Scott2020-04-105-5/+6
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'docs-SKIP_PRECOMPILE_HEADERS-formatting' into release-3.17Craig Scott2020-04-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a293d05c41 Help: Fix unescaped asterisks in docs for SKIP_PRECOMPILE_HEADERS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4592
| * | | | | | | | | | | | Help: Fix unescaped asterisks in docs for SKIP_PRECOMPILE_HEADERSCraig Scott2020-04-101-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | CMake 3.17.1v3.17.1Brad King2020-04-091-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'ccmake_incremental_log_display' into release-3.17Brad King2020-04-094-19/+48
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60bfaa8fe6 ccmake: Use incremental rendering for the logs e9b36731e9 cmCursesLongMessageForm: Factor out helper to draw message to form Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4573
| * | | | | | | | | | | | ccmake: Use incremental rendering for the logsSylvain Joubert2020-04-084-11/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should avoid an exponential slowdown in the display time for projects with lots of output. This is still slower than cmake due to the ncurses drawing, but it should now be O(L) in total and not O(L^2) wrt to output length. Fixes: #20535
| * | | | | | | | | | | | cmCursesLongMessageForm: Factor out helper to draw message to formBrad King2020-04-082-8/+15
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'apple-arch-sysroots' into release-3.17Brad King2020-04-093-13/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84a1e67380 Apple: Fix mapping CMAKE_APPLE_ARCH_SYSROOTS to custom OSX_ARCHITECTURES 45fa9b32ca Apple: Improve handling of missing SDKs in CMAKE_APPLE_ARCH_SYSROOTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4583
| * | | | | | | | | | | | | Apple: Fix mapping CMAKE_APPLE_ARCH_SYSROOTS to custom OSX_ARCHITECTURESBrad King2020-04-082-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CMAKE_OSX_ARCHITECTURES` value is not used directly by generators. It is used to initialize a per-target `OSX_ARCHITECTURES` property, but that property can also be set explicitly by project code to a subset of the full list of architectures. In order to handle this case, construct a mapping from each `CMAKE_OSX_ARCHITECTURES` entry to the corresponding `CMAKE_APPLE_ARCH_SYSROOTS` entry by name. Use the mapping to find the sysroot for each entry in `OSX_ARCHITECTURES` for a given target. If `CMAKE_APPLE_ARCH_SYSROOTS` does not have the same length as `CMAKE_OSX_ARCHITECTURES`, error out early rather than risking a crash or assertion failure. Fixes: #20534
| * | | | | | | | | | | | | Apple: Improve handling of missing SDKs in CMAKE_APPLE_ARCH_SYSROOTSBrad King2020-04-082-3/+3
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `<arch>-SDK-NOTFOUND` instead of an empty string as a placeholder in `CMAKE_APPLE_ARCH_SYSROOTS` for architectures whose SDK is not found. This ensures the length of `CMAKE_APPLE_ARCH_SYSROOTS` matches the length of `CMAKE_OSX_ARCHITECTURES`. It also makes the missing SDKs more visible in the value. Issue: #20534
* | | | | | | | | | | | | Merge topic 'ninja-order-depends' into release-3.17Brad King2020-04-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f949be4b3 Ninja: Make config uppercase in object order target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4581
| * | | | | | | | | | | | Ninja: Make config uppercase in object order targetKyle Edwards2020-04-071-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20539
* | | | | | | | | | | | Merge topic 'llvm-rc-include-path' into release-3.17Brad King2020-04-074-15/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35a29ec827 llvm-rc: Restore include path for data after explicit preprocessing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4570
| * | | | | | | | | | | | llvm-rc: Restore include path for data after explicit preprocessingThomas Bernard2020-04-064-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 1c2d031cbd (Add -E cmake_llvm_rc to preprocess files for llvm-rc, 2020-01-14, v3.17.0-rc1~24^2) with llvm-rc we explicitly preprocess RC source files and then compile separately without -I flags. This broke cases where the RC source references data files adjacent to itself or in the include path. This change adds the expansion of the include paths when calling the llvm-rc in order for the resource files to be picked up correctly by llvm-rc. Since the RC compiled file is first preprocessed, the file being compiled by llvm-rc resides in the build directory. In order for llvm-rc to find the resource data specified relative to the .rc file being compiled, the source file path is preppended in the include list so that the original source path takes priority over all the other includes paths specified. A space was added in the CMAKE_INCLUDE_FLAG_RC to make the include directive work properly for llvm-rc. Checks on the rc.exe showed that the syntax change doesn't affect it's proper operation. Fixes: #20529
* | | | | | | | | | | | | Merge topic 'doc-3.15-std-fix' into release-3.17Brad King2020-04-061-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 182a104478 Help: Add 3.15 release note for change in -std= flag for compile features Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4574
| * | | | | | | | | | | | Help: Add 3.15 release note for change in -std= flag for compile featuresBrad King2020-04-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #19917
* | | | | | | | | | | | | Merge topic 'docs-CMAKE_FIND_DEBUG_MODE' into release-3.17Craig Scott2020-04-062-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 477b8b5dfe Help: Improve discoverability of CMAKE_FIND_DEBUG_MODE 218bda9671 Help: Fix CMAKE_FIND_DEBUG_MODE list formatting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4569
| * | | | | | | | | | | | | Help: Improve discoverability of CMAKE_FIND_DEBUG_MODECraig Scott2020-04-041-1/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Help: Fix CMAKE_FIND_DEBUG_MODE list formattingCraig Scott2020-04-041-0/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge topic 'ExternalProject-no-extract-bool' into release-3.17Brad King2020-04-032-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c4bb705e8 ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4562
| * | | | | | | | | | | | | ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF`Ben Boeckel2020-04-022-1/+10
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20531