mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-27 11:18:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
45,643 Commits 2 Branches 391 Tags
a17f6eff4382a9461b412897709e86a58a29c920
Commit Graph

9851 Commits

Author SHA1 Message Date
Brad King
a17f6eff43 AIX: Restore pre-3.16 undocumented method to suppress exports with XL 
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
 2020-01-30 11:38:17 -05:00
Brad King
bcb0816cf9 Merge topic 'InstallRequiredSystemLibraries-redist' into release-3.16 
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
 2020-01-21 09:15:17 -05:00
Brad King
7ca923bcaf IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available 
VS now distributes these additional runtime libraries.  Install them if
available.

Fixes: #20228
 2020-01-20 13:19:56 -05:00
Brad King
4c907eae69 Merge topic 'findopenssl-dependencies-link-order' into release-3.16 
d2880aaa06 FindOpenSSL: Fix ordering of dependency link flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4235
 2020-01-17 09:25:23 -05:00
Brad King
8cd35baae9 Merge topic 'nag-submodule' into release-3.16 
f7f60ddcf9 Fortran: Add support for NAG Fortran submodules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4229
 2020-01-16 10:56:02 -05:00
Ashley Whetter
d2880aaa06 FindOpenSSL: Fix ordering of dependency link flags 
Fixes: #20082, #20224
 2020-01-16 10:53:19 -05:00
Neil Carlson
f7f60ddcf9 Fortran: Add support for NAG Fortran submodules 
They use a `.sub` extension.

Fixes: #20220
 2020-01-15 14:12:22 -05:00
Brad King
f0986f62a8 Merge topic 'python39' into release-3.16 
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
 2020-01-15 13:36:35 -05:00
Miro Hrončok
f6474214b3 FindPython: Add support for version 3.9 
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/
 2020-01-14 15:02:19 -05:00
Brad King
e6c5bed2aa Merge topic 'FindMatlab-r2019' into release-3.16 
edb6fe3b6a FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4207
 2020-01-14 08:57:18 -05:00
Brad King
789bbcddc0 Merge topic 'FindMatlab-only-CXX' into release-3.16 
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
 2020-01-14 08:55:57 -05:00
Silvio Traversaro
b704d58f41 FindMatlab: in matlab_add_mex use the correct version file 
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
 2020-01-13 10:52:57 -05:00
Silvio Traversaro
edb6fe3b6a FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPING 
Reference for versions: https://www.mathworks.com/products/compiler/matlab-runtime.html

Fixes: #20087
 2020-01-13 10:45:54 -05:00
Brad King
e8462a105e Merge topic 'fix-cpack-deb-description-file' into release-3.16 
d491f34a5e CPack: Fix regression in DEB generator description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4204
 2020-01-13 10:23:26 -05:00
Brad King
b1a9d49a69 Merge topic 'objc-visibility-inlines' into release-3.16 
7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4199
 2020-01-13 10:22:06 -05:00
Brad King
01b43e85cf Merge topic 'macOS-Xcode-11-frameworks' into release-3.16 
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
 2020-01-13 10:20:58 -05:00
Kyle Edwards
d491f34a5e CPack: Fix regression in DEB generator description 
Fixes: #20102
 2020-01-10 17:22:52 -05:00
Brad King
a7fc5df5d3 Merge topic 'GNUtoMS-vs2019' into release-3.16 
08c5b3eff0 GNUtoMS: Add search path for VS 2019 environment scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4197
 2020-01-10 13:20:03 -05:00
Cristian Adam
7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support 
Fixes: #20193
 2020-01-10 16:31:27 +01:00
Marc Chevrier
fcde42751a FindPython: ensure new Xcode framework for Python3 is detected 2020-01-10 13:48:39 +01:00
Marc Chevrier
dd7b741b81 macOS: Add support for new Xcode 11 frameworks directory 
Update CMAKE_SYSTEM_FRAMEWORK_PATH with new Xcode 11 frameworks directory
 2020-01-10 13:48:39 +01:00
Brad King
08c5b3eff0 GNUtoMS: Add search path for VS 2019 environment scripts 
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
 2020-01-09 16:56:30 -05:00
Marc Chevrier
fe280e0cda FindPython*: Fix erroneous target properties setting 
Property IMPORTED_CONFIGURATIONS for targets Python*::Python
and Python*::Module is not correctly set.
 2019-12-19 19:42:24 +01:00
Brad King
118f7efba9 Merge topic 'FindLAPACK-in-blas' into release-3.16 
930f204b68 FindLAPACK: Fix support for LAPACK symbols inside BLAS libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4144
 2019-12-18 09:33:21 -05:00
Brad King
62475f7da0 Merge topic 'FindBoost-1.72' into release-3.16 
e51232b739 FindBoost: Add support for Boost 1.72

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4143
 2019-12-18 09:32:41 -05:00
Brad King
930f204b68 FindLAPACK: Fix support for LAPACK symbols inside BLAS libraries 
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
 2019-12-18 05:51:50 -05:00
Brad King
e51232b739 FindBoost: Add support for Boost 1.72 
Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.72.0
sources to compute dependencies.

Fixes: #20100
 2019-12-17 10:37:06 -05:00
Brad King
e3059f7bb4 Merge topic 'FindBLAS-OpenBLAS-thread' into release-3.16 
d1e111d166 FindBLAS: Consider OpenBLAS with thread libraries only with C or CXX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4134
 2019-12-13 10:36:35 -05:00
Brad King
d71591dfd5 Merge branch 'FindBLAS-OpenBLAS-thread' into release-3.15 
Merge-request: !4134
 2019-12-12 12:13:10 -05:00
Brad King
d1e111d166 FindBLAS: Consider OpenBLAS with thread libraries only with C or CXX 
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
 2019-12-12 12:10:47 -05:00
Brad King
b3a536e726 Merge branch 'backport-3.15-vs-v142-version' into release-3.15 
Merge-request: !4133
 2019-12-12 11:38:15 -05:00
Brad King
d8d4924d98 VS: Fix support for v142 toolset minor versions in VS 16.5+ 
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
 2019-12-12 11:28:34 -05:00
Brad King
07612646fe VS: Fix support for v142 toolset minor versions in VS 16.5+ 
The fix in commit 5117389931 (VS: Fix support for v142 toolset minor
versions, 2019-10-01, v3.15.5~6^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
 2019-12-12 11:25:42 -05:00
Brad King
db127457e3 Merge topic 'wxwidgets_macos_weakframework' into release-3.16 
ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4126
 2019-12-10 09:29:01 -05:00
Tobias Taschner
ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS 
Previously only -framework was used starting with 3.1.3 -weak_framework
might also be used and has to be handled.
 2019-12-10 09:11:14 -05:00
Brad King
3d1a939af1 Merge branch 'backport-3.15-FindGTK2-harfbuzz' into release-3.15 
Merge-request: !3877
 2019-12-09 13:23:38 -05:00
Markus Mittendrein
e4b1b79abb FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS 
Fixes: #19531
 2019-12-09 12:04:33 -05:00
Brad King
158839f0db Merge topic 'FindThreads-lib-flag' into release-3.16 
f7ffefea7c FindThreads: Restore hard-coded '-l' flag on library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4112
 2019-12-05 11:40:35 -05:00
Brad King
f7ffefea7c FindThreads: Restore hard-coded '-l' flag on library name 
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
 2019-12-04 13:58:44 -05:00
Cristian Adam
df8372da09 PCH: Do not add #pragma system_header for Xcode generator 
Fixes: #20039
 2019-12-04 12:56:53 -05:00
Brad King
4e4327ee3c Merge branch 'backport-implicit-includes-extra-CR' into release-3.15 
Merge-request: !4088
 2019-11-26 09:03:14 -05:00
Brad King
8db38cfe33 Merge topic 'implicit-includes-extra-CR' into release-3.16 
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
 2019-11-26 09:02:40 -05:00
Brad King
6d84afc7f2 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR 2019-11-26 09:00:38 -05:00
Brad King
0cb043390b Merge topic 'FindODBC-mingw' into release-3.16 
cb8042b0ab FindODBC: Add library name for MinGW toolchains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4076
 2019-11-26 08:56:32 -05:00
Brad King
4b46523d90 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output 
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
 2019-11-25 14:32:02 -05:00
Cristian Adam
cb8042b0ab FindODBC: Add library name for MinGW toolchains 
Fixes: #20018
 2019-11-25 13:55:51 -05:00
Brad King
a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs 
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
 2019-11-22 11:03:33 -05:00
Craig Sturdy
84408ff402 FindwxWidgets: Find wxQt debug libraries 
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.
 2019-11-20 10:06:15 -05:00
Brad King
3a87ce6c96 Merge topic 'swift-rpath-darwin' into release-3.16 
ff6c336127 Swift: support `-rpath` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4059
 2019-11-18 13:43:11 -05:00
Brad King
4bbd9e9ec4 Merge topic 'swift-darwin-install-name' into release-3.16 
f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4060
 2019-11-18 13:42:08 -05:00