summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'vs-pch-compile-opts' into release-3.16Brad King2020-05-112-1/+4
|\ | | | | | | Merge-request: !4734
| * VS: Fix using PCH from source with COMPILE_OPTIONSBrad King2020-05-112-1/+4
| | | | | | | | | | | | | | If a source file gets per-source flags from both PCH and custom `COMPILE_OPTIONS`, combine them correctly. Fixes: #20694, #20456
* | Merge branch 'FindGTK2-harfbuzz-target' into release-3.16Brad King2020-05-091-3/+6
|\ \ | | | | | | | | | Merge-request: !4725
| * | FindGTK2: Add harfbuzz target for dependency from pangoBrad King2020-05-091-3/+6
| |/ | | | | | | | | | | | | | | | | | | Since commit effafca77e (FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS, 2019-10-01, v3.16.0-rc1~22^2), pango's dependency on harfbuzz has been captured, but only for the `GTK2_INCLUDE_DIRS` and `GTK2_LIBRARIES` variables. Add the `GTK2::harfbuzz` imported target and update the `GTK2::pango` target to depend on it. Issue: #19531
* | Merge branch 'backport-3.16-FindPkgConfig-isystem' into release-3.16Brad King2020-05-062-9/+63
|\ \ | | | | | | | | | Merge-request: !4693
| * | FindPkgConfig: also handle "-isystem" prefixes for include directoriesRolf Eike Beer2020-05-052-9/+63
| |/ | | | | | | Fixes: #20652
* | Merge branch 'CheckLanguage-cuda-host' into release-3.16Brad King2020-05-052-10/+10
|\ \ | | | | | | | | | Merge-request: !4711
| * | CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILERBrad King2020-05-052-10/+10
| |/ | | | | | | | | | | | | | | | | | | | | Fix the condition added by commit fada8cbfd6 (CheckLanguage: Report CMAKE_CUDA_HOST_COMPILER if needed for compilation, 2019-05-31, v3.15.0-rc1~12^2) to activate CUDA-specific logic. The old condition had worked in our test suite only by accident because the loop variable used in the test happened to be the name and value that the old condition used! Update the test to use a different name. Fixes: #19013
* | Merge branch 'makefile-objc' into release-3.16Brad King2020-04-282-3/+4
|\ \ | | | | | | | | | 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 branch 'pch-genex-absolute' into release-3.16Brad King2020-04-275-16/+19
|\ \ | | | | | | | | | 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 branch 'ibmi-aix-exports' into release-3.16Brad King2020-04-141-2/+5
|\ \ | | | | | | | | | Merge-request: !4611
| * | AIX: Activate symbol export/import IBM i (OS400)Brad King2020-04-141-2/+5
| |/ | | | | | | Fixes: #20582
* | Merge branch 'FindMPI-pgi-spectrum-mpi-wrappers' into release-3.16Brad King2020-04-141-3/+3
|\ \ | |/ |/| | | Merge-request: !4598
| * FindMPI: Add the pgi compiler wrapper names used by IBM Spectrum MPIChuck Atkins2020-04-101-3/+3
|/
* 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
| * Help: Add 3.15 release note for change in -std= flag for compile featuresBrad King2020-04-061-0/+9
| | | | | | | | Issue: #19917
* | Merge branch 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.16Brad King2020-04-011-1/+1
|\ \ | | | | | | | | | Merge-request: !4557
| * | FindPython: fix handling when FIND_VIRTUALENV == FIRSTMarc Chevrier2020-04-011-1/+1
| | | | | | | | | | | | Fixes: #20525
* | | Merge branch 'backport-3.16-link-libs-config-case' into release-3.16Brad King2020-03-305-5/+30
|\ \ \ | | | | | | | | | | | | Merge-request: !4544
| * | | target_link_libraries: Fix regression in case of $<CONFIG> genexBrad King2020-03-305-5/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b8626261e9 (Precompile headers: Add methods to generate PCH sources, 2019-07-13, v3.16.0-rc1~182^2~4) we look up source files for a target using an upper-case configuration even though an original-case name is sufficient. Since commit 36ded610af (PCH: Generate sources during Compute step, 2019-10-05, v3.16.0-rc1~2^2) the source file lookup is the first time we compute many on-demand structures that depend on the configuration name. This caused the `$<CONFIG>` generator expression to evaluate to the upper-case configuration name in some cases where we used original-case before. Fix this by switching the source file lookup to the original-case config name. Add a test covering the symptom that led to the discovery of this problem. Fixes: #20517
* | | Merge branch 'aix-ExportImportList-install' into release-3.16Brad King2020-03-301-0/+4
|\ \ \ | | | | | | | | | | | | Merge-request: !4545
| * | | AIX: Install ExportImportList script with execute permissionBrad King2020-03-301-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script was added by commit 0f150b69d3 (AIX: Explicitly compute shared object exports for both XL and GNU, 2019-07-11, v3.16.0-rc1~418^2~2) but does not have a `.sh` extension so our existing install rules neglect to give it execute permission. Our test suite works on AIX in the build tree but the script is broken without execute permission on installation. Fixes: #20520
* | | 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
| | |