summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'backport-3.15-install-default-fix'Brad King2020-02-110-0/+0
|\
| * Merge branch 'backport-3.14-install-default-fix'Brad King2020-02-110-0/+0
| |\
| | * 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
| * | 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
| * | 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
* | | | | | | 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
* | | | | | | 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
* | | | | CMake 3.16.3v3.16.3Brad King2020-01-211-1/+1
| | | | |
* | | | | Merge topic 'InstallRequiredSystemLibraries-redist' into release-3.16Brad King2020-01-211-6/+20
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ca923bcaf IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Andrey Vihrov <andrey.vihrov@gmail.com> Merge-request: !4247
| * | | | IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if availableBrad King2020-01-201-6/+20
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | VS now distributes these additional runtime libraries. Install them if available. Fixes: #20228
* | | | Merge topic 'autogen_rcc_skip_unity' into release-3.16Brad King2020-01-202-14/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 086d9b2bab Autogen: Enable SKIP_UNITY_BUILD_INCLUSION on AUTORCC generated files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Cristian Adam <cristian.adam@gmail.com> Merge-request: !4237
| * | | | Autogen: Enable SKIP_UNITY_BUILD_INCLUSION on AUTORCC generated filesSebastian Holtermann2020-01-172-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `rcc` generated files are not compatible with unity builds, because they contain classes in anonymous namespaces and static data with identical names. This patch sets the source file property `SKIP_UNITY_BUILD_INCLUSION` to `On` on all `AUTORCC` generated files to exclude them from unity build files. Fixes: #20191 "QT5: Exclude resource files from unity build"
* | | | | Merge topic 'pch-msvc-no-path-repetition' into release-3.16Craig Scott2020-01-191-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07fe1bcd4e PCH: No repeated path for internal generated PCH files (MSVC case) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4236
| * | | | | PCH: No repeated path for internal generated PCH files (MSVC case)Cristian Adam2020-01-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19952
* | | | | | Merge topic 'findopenssl-dependencies-link-order' into release-3.16Brad King2020-01-171-7/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2880aaa06 FindOpenSSL: Fix ordering of dependency link flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4235
| * | | | | | FindOpenSSL: Fix ordering of dependency link flagsAshley Whetter2020-01-161-7/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes: #20082, #20224
* | | | | | Merge topic 'nag-submodule' into release-3.16Brad King2020-01-162-2/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7f60ddcf9 Fortran: Add support for NAG Fortran submodules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4229
| * | | | | Fortran: Add support for NAG Fortran submodulesNeil Carlson2020-01-152-2/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | They use a `.sub` extension. Fixes: #20220
* | | | | Merge topic 'unity-lang-filename' into release-3.16Brad King2020-01-1512-16/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 274a6f3699 Unity Build: include language in generated source file name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4223
| * | | | | Unity Build: include language in generated source file nameCristian Adam2020-01-1412-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20206
* | | | | | Merge topic 'python39' into release-3.16Brad King2020-01-153-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6474214b3 FindPython: Add support for version 3.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Marc Chevrier <marc.chevrier@gmail.com> Acked-by: Björn Esser <besser82@fedoraproject.org> Merge-request: !4225
| * | | | | FindPython: Add support for version 3.9Miro Hrončok2020-01-143-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Development versions of Python 3.9.0 are already out there. See PEP 596 -- Python 3.9 Release Schedule: https://www.python.org/dev/peps/pep-0596/
* | | | | | Merge topic 'vs-Fortran-link-flags' into release-3.16Brad King2020-01-141-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3c827b2ea VS: Add Fortran link flag table entries for /OPT:* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4210
| * | | | | | VS: Add Fortran link flag table entries for /OPT:*Pavel Liavonau2020-01-131-0/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes: #20190
* | | | | | Merge topic 'FindMatlab-r2019' into release-3.16Brad King2020-01-141-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edb6fe3b6a FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPING Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4207
| * | | | | | FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPINGSilvio Traversaro2020-01-131-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference for versions: https://www.mathworks.com/products/compiler/matlab-runtime.html Fixes: #20087
* | | | | | Merge topic 'FindMatlab-only-CXX' into release-3.16Brad King2020-01-141-4/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b704d58f41 FindMatlab: in matlab_add_mex use the correct version file Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Patrik Huber <patrikhuber@gmail.com> Merge-request: !4206
| * | | | | | FindMatlab: in matlab_add_mex use the correct version fileSilvio Traversaro2020-01-131-4/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this modification, the c_mexapi_version.c file was added to all mex libraries. However, if the C language was not enabled in the CMake project configuration, the c_mexapi_version.c file was ignored, creating linking errors in Windows and macOS. This commit ensures that in the case only the CXX languages is enabled, the correct version is passed. Fixes: #19382
* | | | | | Merge topic 'fix-cpack-deb-description-file' into release-3.16Brad King2020-01-137-10/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d491f34a5e CPack: Fix regression in DEB generator description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4204
| * | | | | | CPack: Fix regression in DEB generator descriptionKyle Edwards2020-01-107-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20102
generated by cgit v0.12 at 2025-01-28 02:47:57 (GMT)