summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'make-nested-silent' into release-3.16Brad King2020-03-261-1/+5
|\ | | | | | | Merge-request: !4515
| * Makefiles: Fix silencing of nested calls for GNU make 4.3Brad King2020-03-261-1/+5
| | | | | | | | | | | | | | | | Since GNU make 4.3, `.SILENT:` no longer causes nested `$(MAKE)` calls to get `-s` implicitly. Add the `-s` flag explicitly on such calls to suppress messages about Entering/Leaving directories. Fixes: #20487
* | Merge branch 'GetPrerequisites-vcruntime-is-system' into release-3.16Brad King2020-03-191-3/+3
|\ \ | | | | | | | | | Merge-request: !4506
| * | GetPrerequisites: Classify vcruntime libraries as systemErr0rC0deX2020-03-191-3/+3
| |/ | | | | | | | | Previously GetPrerequisites classified `vcruntime*.dll` as type "other". They should be classified as type "system".
* | Merge branch 'swift-link-line-spaces' into release-3.16Brad King2020-03-121-3/+5
|\ \ | | | | | | | | | Merge-request: !4469
| * | Swift: Fix quoting of library search paths with spacesSaleem Abdulrasool2020-03-121-3/+5
| |/ | | | | | | | | | | | | | | The library search paths added by commit 2746c61e6d (Swift: Add library search paths for dependencies, 2019-06-09, v3.16.0-rc1~561^2) need to be quoted properly on command lines to handle spaces and such. This was already done by `cmLinkLineComputer::ComputeLinkPath` for non-Swift-specific link directories.
* | Merge branch 'ibmi-fix-libuv-build' into release-3.16Brad King2020-03-061-0/+19
|\ \ | | | | | | | | | Merge-request: !4431
| * | libuv: Add support for building on IBM i (OS400)Jesse Gorzinski2020-03-061-0/+19
| |/
* | Merge branch 'cmstd-IBM-i' into release-3.16Brad King2020-03-051-1/+1
|\ \ | |/ |/| | | Merge-request: !4430
| * cmstd: Remove -isystem option for IBM i (OS400)ThePrez2020-03-051-1/+1
|/ | | | | | | | Much like AIX, IBM i (OS identifier "OS400") implicitly adds `extern "C"` around system header files included with the `-isystem` option. Update the condition added by commit c688b401d3 (cmstd: Modernize CMake system headers, 2019-08-04, v3.16.0-rc1~81^2~1) to treat `IBM i` as we do AIX.
* CMake 3.16.5v3.16.5Brad King2020-03-041-1/+1
|
* Merge branch 'doc-rel-3.16-updates' into release-3.16Brad King2020-03-041-0/+26
|\ | | | | | | Merge-request: !4425
| * Help: Update CMake 3.16 release notes for 3.16.5Brad King2020-02-271-0/+26
|/
* Merge branch 'backport-3.16-FindPython-cache-cleanup' into release-3.16Brad King2020-02-271-51/+98
|\ | | | | | | | | | | | | | | 1dc524f2 FindPython: Do not cache computed result variables in CMake 3.16 602d1d82 FindPython: Mark non-public cache entries INTERNAL in CMake 3.16 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4399
| * FindPython: Do not cache computed result variables in CMake 3.16Marc Chevrier2020-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | Since commit 06d9e67fbd (FindPython: Add capability to specify directly artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally add the result variables `Python*_LIBRARY_RELEASE` and `Python*_LIBRARY_DEBUG` to the cache. They are always computed from other results and so should not be presented to users in cmake-gui and ccmake to edit. Issue: #20362
| * FindPython: Mark non-public cache entries INTERNAL in CMake 3.16Marc Chevrier2020-02-261-48/+95
| | | | | | | | | | | | | | | | | | Since commit 06d9e67fbd (FindPython: Add capability to specify directly artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally expose cache entries named `_Python...` to users in cmake-gui and ccmake. Mark those entries as `INTERNAL` to hide them. Issue: #20362
* | Merge branch 'FindPkgConfig-scope' into release-3.16Brad King2020-02-241-0/+6
|\ \ | | | | | | | | | Merge-request: !4388
| * | FindPkgConfig: set policies CMP0054 and CMP0057 to newRolf Eike Beer2020-02-241-0/+6
| |/ | | | | | | | | | | One may encounter warnings if FindPkgConfig is used in any project, even indirectly, that has set any of these policies to old explicitely or requires an older version.
* | Merge branch 'backport-cuda-non-device-link' into release-3.16Brad King2020-02-242-3/+3
|\ \ | | | | | | | | | Merge-request: !4376
| * | Ninja: Do not use nvcc response files with non-nvcc toolsFrancisco Facioni2020-02-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d91b5a72cd (Ninja: Add support for CUDA nvcc response files, 2019-05-30, v3.15.0-rc1~8^2) we use NVCC's `--options-file` option to avoid long link command lines via a response file. However, for non-device linking the host tools are used and the option does not make sense. Update the logic to use `--options-file` only for device linking. Linking with the host tools already has its own logic for response files. Fixes: #19954
* | | Merge branch 'backport-3.16-install-default-fix' into release-3.16Brad King2020-02-127-18/+50
|\ \ \
| * | | install: Fix regression when using default destinationsKyle Edwards2020-02-117-18/+50
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 9fc20a4f3e (install: Add sane set of defaults for DESTINATION and file type parameters, 2018-11-02, v3.14.0-rc1~410^2~1), a regression was introduced, in which an `install(TARGETS)` with a RUNTIME/LIBRARY/ARCHIVE DESTINATION but no PUBLIC_HEADER/PRIVATE_HEADER DESTINATION would then install the headers. The old behavior did not do this. Restore the old behavior. Fixes: #20326
* | | Merge branch 'release-3.15' into release-3.16Brad King2020-02-110-0/+0
|\ \ \ | | |/ | |/|
| * | CMake 3.15.7v3.15.7Brad King2020-02-041-1/+1
| | |
| * | Merge branch 'vs-16.4-custom-command-inputs' into release-3.15Brad King2020-01-281-1/+7
| |\ \ | | | | | | | | | | | | Merge-request: !4297
| * \ \ Merge branch 'msvc-runtime-library-masm' into release-3.15Brad King2020-01-211-0/+6
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !4257
| * \ \ \ Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15Brad King2020-01-201-6/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !4247
| * \ \ \ \ Merge branch 'backport-3.15-cuda-device-link-only-cuda' into release-3.15Brad King2020-01-094-18/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4191
* | \ \ \ \ \ Merge branch 'backport-3.16-link-line-backtrace' into release-3.16Brad King2020-02-109-93/+85
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4344
| * | | | | | | Propagate backtraces from LINK_LIBRARIES through to link line itemsBrad King2020-02-109-93/+85
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d4d0dd0f6a (cmLinkLineComputer: Add ComputeLinkLibs overload with backtraces, 2019-09-13, v3.16.0-rc1~87^2~4), backtraces have been collected by `ComputeLinkLibs` by looking back through the link implementation libraries for one matching the text of the link line item. This is slow in projects with long link lines. Instead, teach `cmComputeLinkDepends` and `cmComputeLinkInformation` to carry backtrace information explicitly along with the text of each item. Fixes: #20322
* | | | | | | Merge branch 'libarchive-win-codepage' into release-3.16Brad King2020-02-061-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | Merge-request: !4332
| * | | | | | libarchive: Add support for UTF-8 locale on WindowsBrad King2020-02-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport libarchive upstream commit `c46e7993` (windows: Support UTF-8 locale, 2018-07-23, v3.4.0~105^2). Fixes: #20320
| * | | | | | libarchive: Fix WideCharToMultiByte output buffer sizeBrad King2020-02-061-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `archive_string_append_from_wcs_in_codepage` to account for the already-used portion of the buffer when computing the size of the remaining buffer for ``WideCharToMultiByte` output.
* | | | | | CMake 3.16.4v3.16.4Brad King2020-02-051-1/+1
| | | | | |
* | | | | | Merge topic 'vs-version-for-unity' into release-3.16Brad King2020-02-053-7/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9135954e2f VS: Do not use native unity builds on VS 2017 versions less than 15.8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4324
| * | | | | | VS: Do not use native unity builds on VS 2017 versions less than 15.8Brad King2020-02-043-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 version 15.8 introduced support for unity builds implemented in part by the `$(VCTargetsPath)/Microsoft.Cpp.Unity.targets` file. Do not enable unity builds on VS 15 versions that do not have that file. Fixes: #20284
* | | | | | | Merge topic 'android-ndk-r19-binutils' into release-3.16Brad King2020-02-041-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3d3b7ddeb Android: Fix binutils selection with NDK r19+ unified toolchain Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4318
| * | | | | | | Android: Fix binutils selection with NDK r19+ unified toolchainBrad King2020-02-031-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 97bca2f9fa (Android: Use unified toolchain in NDK r19+, 2019-07-26, v3.16.0-rc1~342^2) we hard-coded use of the unified toolchain for NDK r19+ and skipped most of the old detection logic. However, in that fast path we left out setting `_CMAKE_TOOLCHAIN_PREFIX` for `CMakeFindBinutils` to select the matching binutils. Add it. Fixes: #20038
* | | | | | | Merge topic 'aix-skip-exports' into release-3.16Brad King2020-01-311-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a17f6eff43 AIX: Restore pre-3.16 undocumented method to suppress exports with XL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4303
| * | | | | | | AIX: Restore pre-3.16 undocumented method to suppress exports with XLBrad King2020-01-301-1/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 0f150b69d3 (AIX: Explicitly compute shared object exports for both XL and GNU, 2019-07-11, v3.16.0-rc1~418^2~2) we dropped use of the old `CMAKE_XL_CreateExportList` cache entry for XL exports. However, some people were setting the value to an empty string as a way to disable automatic export of symbols. Restore this behavior when the option is explicitly set to an empty string. Issue: #20290
* | | | | | | Merge topic 'vs-16.4-custom-command-inputs' into release-3.16Brad King2020-01-291-1/+7
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58b0674687 VS: Tell VS 16.4 not to verify SYMBOLIC custom command inputs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4297
| * | | | | | VS: Tell VS 16.4 not to verify SYMBOLIC custom command inputsBrad King2020-01-281-1/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix from commit 0578239d3a (VS: Tell VS 16.4 not to verify SYMBOLIC custom command outputs, 2019-09-23, v3.15.4~2^2) to apply to SYMBOLIC *inputs* too. This is needed when there is a chain of custom commands that use symbolic paths for ordering. Fixes: #20179
* | | | | | Merge topic 'cpack-deb-fix-description' into release-3.16Brad King2020-01-276-9/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | baec299ecd CPack: Fix regression in Deb description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4271
| * | | | | | CPack: Fix regression in Deb descriptionKyle Edwards2020-01-246-9/+20
|/ / / / / / | | | | | | | | | | | | | | | | | | Fixes: #20254
* | | | | | Merge topic 'get-runtime-dependencies-keyword-args' into release-3.16Brad King2020-01-233-5/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c8a917a87 file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4262
| * | | | | | file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list argumentsKyle Edwards2020-01-223-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also list all keywords that were missing values instead of only the first one.
* | | | | | | Merge topic 'findmpi-documentation' into release-3.16Brad King2020-01-231-5/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95a501addb Help: Add more variable documentation to FindMPI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4263
| * | | | | | Help: Add more variable documentation to FindMPIKyle Edwards2020-01-221-5/+17
|/ / / / / /
* | | | | | Merge topic 'msvc-runtime-library-masm' into release-3.16Brad King2020-01-221-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | 1421005835 ASM_MASM: Populate MSVC runtime library abstraction table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4257
| * | | | ASM_MASM: Populate MSVC runtime library abstraction tableBrad King2020-01-211-0/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fb3370b6a1 (MSVC: Add abstraction for runtime library selection, 2019-04-10, v3.15.0-rc1~229^2) we overlooked populating the runtime library selection flags for the Microsoft assembler. It does not actually have any such flags, but since its compiler id is `MSVC` our generators expect the table to be populated. Use empty values. Without this fix, enabling the `ASM_MASM` language with policy `CMP0091` set to `NEW` causes an error due to the missing table entries. Fixes: #20236, #19453