summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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-161-0/+2
|\ \ | | | | | | | | | | | | | | | | | | 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-151-0/+2
| |/ | | | | | | | | | | They use a `.sub` extension. Fixes: #20220
* | 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 '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-132-3/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-102-3/+12
| | | | | | | | | | | | | | | | Fixes: #20102
* | | | Merge topic 'objc-visibility-inlines' into release-3.16Brad King2020-01-133-7/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 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-103-7/+5
| | | | | | | | | | | | | | | | 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 '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
* | 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.
* 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 '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
* | | VS: Fix support for v142 toolset minor versions in VS 16.5+Brad King2019-12-121-3/+4
| |/ |/| | | | | | | | | | | | | | | | | The fix in commit 5117389931 (VS: Fix support for v142 toolset minor versions, 2019-10-01, v3.16.0-rc1~32^2) worked around a bug in VS's placement of toolset files. VS 16.5 will fix that bug and restore the original pattern for locations of toolset files. Update our logic to look for both possibilities. Issue: #19779
* | Merge topic 'wxwidgets_macos_weakframework' into release-3.16Brad King2019-12-101-0/+2
|\ \ | | | | | | | | | | | | | | | | | | ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4126
| * | FindwxWidgets: Add support for 3.1.3 on macOSTobias Taschner2019-12-101-0/+2
| | | | | | | | | | | | Previously only -framework was used starting with 3.1.3 -weak_framework might also be used and has to be handled.
* | | Merge topic 'FindThreads-lib-flag' into release-3.16Brad King2019-12-051-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f7ffefea7c FindThreads: Restore hard-coded '-l' flag on library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4112
| * | | FindThreads: Restore hard-coded '-l' flag on library nameBrad King2019-12-041-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | Revert commit de5f123d3a (FindThreads: Do not hard-code '-l' flag on library name, 2019-09-23, v3.16.0-rc1~71^2). Some clients depend on the value of `CMAKE_THREAD_LIBS_INIT` to contain a valid flag. Fixes: #20061, #20065
* | | PCH: Do not add #pragma system_header for Xcode generatorCristian Adam2019-12-042-2/+6
|/ / | | | | | | Fixes: #20039
* | Merge topic 'implicit-includes-extra-CR' into release-3.16Brad King2019-11-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d84afc7f2 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR 4b46523d90 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output 2a5e5b25ba CMake 3.15.5 08173075c1 Merge branch 'doc-genex-tweak' into release-3.15 83dbef1135 Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15 881bca249d Merge branch 'vs-v142-csharp-flags' into release-3.15 dec3e9363e Merge branch 'backport-vs-16.4-global-targets' into release-3.15 ac1a1bf18b VS: Tell VS 16.4 not to verify CMake-provided custom command outputs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4088
| * \ Merge branch 'backport-implicit-includes-extra-CR' into ↵Brad King2019-11-261-1/+1
| |\ \ | | | | | | | | | | | | implicit-includes-extra-CR
| | * | CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler outputBrad King2019-11-251-1/+1
| | |/ | | | | | | | | | | | | | | | | | | With Clang/LLVM on MinGW, lines ending in `\r\r\n` have been observed. Filter out all `\r` characters from these line endings. Fixes: #20021
| | * Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15Brad King2019-10-111-0/+7
| | |\ | | | | | | | | | | | | Merge-request: !3909
* | | \ Merge topic 'FindODBC-mingw' into release-3.16Brad King2019-11-261-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb8042b0ab FindODBC: Add library name for MinGW toolchains Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4076
| * | | | FindODBC: Add library name for MinGW toolchainsCristian Adam2019-11-251-0/+2
| | | | | | | | | | | | | | | | | | | | Fixes: #20018
* | | | | FindwxWidgets: Fix finding both release and debug libsBrad King2019-11-221-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fe54989fcd (FindwxWidgets: Add support for wxQt, 2019-11-12, v3.16.0-rc4~12^2~1) the internal `WX_FIND_LIBS` macro gained an argument but not all call sites were updated. Update the missing one now. Fixes: #20005
* | | | FindwxWidgets: Find wxQt debug librariesCraig Sturdy2019-11-201-0/+2
|/ / / | | | | | | | | | | | | Extend the change from commit fe54989fcd (FindwxWidgets: Add support for wxQt, 2019-11-12, v3.16.0-rc4~12^2~1) to also find debug-enabled libs.
* | | Merge topic 'swift-rpath-darwin' into release-3.16Brad King2019-11-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ff6c336127 Swift: support `-rpath` on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4059
| * | | Swift: support `-rpath` on DarwinSaleem Abdulrasool2019-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Darwin also has the concept of RPATH. Additionally, the flag is identical to that on other Unixish platforms. Simply avoid the `-rpath` handling on Windows. This enables the use of `BUILD_WITH_INSTALL_RPATH` and `INSTALL_RPATH` with Swift targets on Darwin.
* | | | Merge topic 'swift-darwin-install-name' into release-3.16Brad King2019-11-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4060
| * | | | Swift: support `INSTALL_NAME_DIR` on DarwinSaleem Abdulrasool2019-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the shared object rule to ensure that we honour the `INSTALL_NAME_DIR` property on Swift targets. This enables the use of `INSTALL_NAME_DIR` and `BUILD_WITH_INSTALL_NAME_DIR` on Darwin with Ninja.
* | | | | Merge topic 'FindPostgreSQL-macports-libsuffix' into release-3.16Brad King2019-11-151-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24ae45fb0c FindPostgreSQL: also search for libraries in the MacPorts suffix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4043
| * | | | | FindPostgreSQL: also search for libraries in the MacPorts suffixBen Boeckel2019-11-131-0/+1
| |/ / / /
* | | | | Merge topic 'FindwxWidgets-mingw' into release-3.16Brad King2019-11-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c921ec6112 FindwxWidgets: Add link dependencies for MinGW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4040
| * | | | | FindwxWidgets: Add link dependencies for MinGWGrant Kim2019-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | wxWidgets on MinGW requires system libraries `uuid` and `uxtheme`.
* | | | | | Merge topic 'FindwxWidgets-qt' into release-3.16Brad King2019-11-131-22/+26
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | | | | | | | | | | fe54989fcd FindwxWidgets: Add support for wxQt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4038
| * | | | FindwxWidgets: Add support for wxQtCraig Sturdy2019-11-121-22/+26
| |/ / /