summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Merge topic 'objc-visibility-inlines' into release-3.16Brad King2020-01-134-11/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4199
| * | | ObjC: Add VISIBLITY_INLINES_HIDDEN supportCristian Adam2020-01-104-11/+10
| | | | | | | | | | | | | | | | Fixes: #20193
* | | | Merge topic 'macOS-Xcode-11-frameworks' into release-3.16Brad King2020-01-132-0/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | fcde42751a FindPython: ensure new Xcode framework for Python3 is detected dd7b741b81 macOS: Add support for new Xcode 11 frameworks directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4198
| * | | FindPython: ensure new Xcode framework for Python3 is detectedMarc Chevrier2020-01-101-0/+3
| | | |
| * | | macOS: Add support for new Xcode 11 frameworks directoryMarc Chevrier2020-01-101-0/+4
| |/ / | | | | | | | | | Update CMAKE_SYSTEM_FRAMEWORK_PATH with new Xcode 11 frameworks directory
* | | Merge topic 'cuda-device-link-only-cuda' into release-3.16Brad King2020-01-104-17/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ffa42288e Merge branch 'backport-3.15-cuda-device-link-only-cuda' 071c4f1a2a CUDA: Do not device link if target has no CUDA usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4191
| * \ \ Merge branch 'backport-3.15-cuda-device-link-only-cuda'Brad King2020-01-094-17/+26
| |\ \ \ | | |/ / | |/| |
| | * | CUDA: Do not device link if target has no CUDA usageRobert Maynard2020-01-094-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CUDA is enabled, and a pure non-CUDA target has CMAKE_CUDA_SEPARABLE_COMPILATION enabled, don't actually perform the device linking step, as it will fail. A target that has CMAKE_CUDA_SEPARABLE_COMPILATION enabled must also have CUDA usage (either itself, or something it links to). Fixes: #20182
* | | | Merge topic 'GNUtoMS-vs2019' into release-3.16Brad King2020-01-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08c5b3eff0 GNUtoMS: Add search path for VS 2019 environment scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4197
| * | | | GNUtoMS: Add search path for VS 2019 environment scriptsBrad King2020-01-091-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Extend the logic from commit abe8a623d9 (GNUtoMS: Add search path for VS 2017 environment scripts, 2017-05-19, v3.8.2~1^2) to consider VS 2019 paths too. Fixes: #20162
* | | | Merge topic 'objc-compiler-launcher' into release-3.16Brad King2020-01-1017-5/+40
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | a05b9d4239 ObjC: Add _COMPILE_LAUNCHER support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4189
| * | | ObjC: Add _COMPILE_LAUNCHER supportCristian Adam2020-01-0917-5/+40
| | | | | | | | | | | | | | | | Fixes: #20178
* | | | Merge branch 'release-3.15' into release-3.16Brad King2020-01-090-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | CMake 3.15.6v3.15.6Brad King2019-12-161-1/+1
| | |
| * | Merge branch 'FindBLAS-OpenBLAS-thread' into release-3.15Brad King2019-12-121-2/+6
| |\ \ | | | | | | | | | | | | Merge-request: !4134
| * \ \ Merge branch 'backport-3.15-vs-v142-version' into release-3.15Brad King2019-12-122-12/+15
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !4133
| * \ \ \ Merge branch 'backport-3.15-toc_on_ppc' into release-3.15Brad King2019-12-092-2/+35
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !4122
| * \ \ \ \ Merge branch 'backport-3.15-FindGTK2-harfbuzz' into release-3.15Brad King2019-12-091-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3877
| | * | | | | FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRSMarkus Mittendrein2019-12-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19531
| * | | | | | Merge branch 'backport-implicit-includes-extra-CR' into release-3.15Brad King2019-11-261-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4088
| * \ \ \ \ \ \ Merge branch 'backport-FindBoost-meta-component-ALL' into release-3.15Brad King2019-11-071-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4008
| | * | | | | | | FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73Deniz Bahadir2019-11-071-0/+3
| | | | | | | | |
| * | | | | | | | Merge branch 'backport-findpostgres-10-and-older' into release-3.15Brad King2019-11-072-8/+28
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | Merge-request: !4007
| | * | | | | | | FindPostgreSQL: support version encoding used in pre-10 releasesBen Boeckel2019-11-072-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the 10.x release, PostgreSQL upstream started encoding the version as `MMmmmm` where `M` is major and `m` is minor. Prior to that, `MMmmPP` was used where `P` was the patch number. Detect this difference and decode it based on the used encoding. Fixes: #19912
* | | | | | | | | Merge topic 'ctest-resource-allocation-spec-message' into release-3.16Craig Scott2019-12-295-76/+153
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b393b32b4b CTest: Improve error handling when reading resource spec file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4162
| * | | | | | | | | CTest: Improve error handling when reading resource spec fileKyle Edwards2019-12-275-76/+153
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20079
* | | | | | | | | Merge topic 'FindPython-Fix-target-properties' into release-3.16Kyle Edwards2019-12-201-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe280e0cda FindPython*: Fix erroneous target properties setting Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4154
| * | | | | | | | FindPython*: Fix erroneous target properties settingMarc Chevrier2019-12-191-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Property IMPORTED_CONFIGURATIONS for targets Python*::Python and Python*::Module is not correctly set.
* | | | | | | | CMake 3.16.2v3.16.2Brad King2019-12-191-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'autogen-no-hh' into release-3.16Brad King2019-12-194-18/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7fa7f55230 Autogen: Revert processing of .hh files for compatibility Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4146
| * | | | | | | | Autogen: Revert processing of .hh files for compatibilityBrad King2019-12-184-18/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4a9154537c (Autogen: Use cmake::IsHeader/SourceExtension for file type detection, 2019-07-02, v3.16.0-rc1~470^2~4) we process `.hh` files with `AUTOMOC`. However, this change can break existing projects that do not expect the behavior. Revert it for now. It can be restored later via a policy. Fixes: #20101
* | | | | | | | | Merge topic 'test-resource-spec-init-lists' into release-3.16Brad King2019-12-192-37/+37
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8dbe4bba1 Tests: Fix testCTestResourceSpec struct initialization for some compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Dickens <michael.dickens@ettus.com> Merge-request: !4141
| * | | | | | | | | Tests: Fix testCTestResourceSpec struct initialization for some compilersMichael Dickens2019-12-182-37/+37
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers do not like the nested `{{{}}}` member initialization syntax, so use just `{}`. GCC 4.8 warns about the latter, so add a suppression. Fixes: #20097
* | | | | | | | | Merge topic 'FindLAPACK-in-blas' into release-3.16Brad King2019-12-181-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 930f204b68 FindLAPACK: Fix support for LAPACK symbols inside BLAS libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4144
| * | | | | | | | | FindLAPACK: Fix support for LAPACK symbols inside BLAS librariesBrad King2019-12-181-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the condition added by commit 68dcbeee01 (FindLAPACK: Test for implicitly linked LAPACK libraries, 2019-06-11, v3.16.0-rc1~560^2) to use BLAS libraries if they are sufficient with no dedicated LAPACK libraries. Fixes: #20099
* | | | | | | | | Merge topic 'FindBoost-1.72' into release-3.16Brad King2019-12-181-3/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e51232b739 FindBoost: Add support for Boost 1.72 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4143
| * | | | | | | | | FindBoost: Add support for Boost 1.72Brad King2019-12-171-3/+17
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.72.0 sources to compute dependencies. Fixes: #20100
* | | | | | | | | Merge topic 'pch-force-include' into release-3.16Brad King2019-12-162-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5c218fa0d PCH: Append pch header file to list of forced include files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4135
| * | | | | | | | | PCH: Append pch header file to list of forced include filesCristian Adam2019-12-132-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20088
* | | | | | | | | | Merge topic 'FindBLAS-OpenBLAS-thread' into release-3.16Brad King2019-12-131-2/+6
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1e111d166 FindBLAS: Consider OpenBLAS with thread libraries only with C or CXX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4134
| * | | | | | | | | FindBLAS: Consider OpenBLAS with thread libraries only with C or CXXBrad King2019-12-121-2/+6
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check added by commit 276b56f01c (FindBLAS: Add second try for OpenBLAS with thread libraries., 2019-06-07, v3.15.0-rc2~5^2) can work only when C or CXX is enabled. Fixes: #20092
* | | | | | | | | Merge topic 'backport-3.16-vs-v142-version' into release-3.16Brad King2019-12-132-12/+18
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f853eec3d Merge branch 'backport-3.15-vs-v142-version' into backport-3.16-vs-v142-version d8d4924d98 VS: Fix support for v142 toolset minor versions in VS 16.5+ 07612646fe VS: Fix support for v142 toolset minor versions in VS 16.5+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4133