mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 11:50:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
45,611 Commits 2 Branches 401 Tags
a7fc5df5d3cd1da907311ee8c57f9dbf74ff7bca
Commit Graph

45611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brad King 213b03d275 Merge topic 'objc-compiler-launcher' into release-3.16 
a05b9d4239 ObjC: Add _COMPILE_LAUNCHER support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4189
 2020-01-10 13:18:35 -05: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
Cristian Adam a05b9d4239 ObjC: Add _COMPILE_LAUNCHER support 
Fixes: #20178
 2020-01-09 11:35:23 -05:00
Brad King 68537b890b Merge branch 'release-3.15' into release-3.16 2020-01-09 11:10:32 -05:00
Craig Scott 6841059c12 Merge topic 'ctest-resource-allocation-spec-message' into release-3.16 
b393b32b4b CTest: Improve error handling when reading resource spec file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4162
 2019-12-28 19:02:59 -05:00
Kyle Edwards b393b32b4b CTest: Improve error handling when reading resource spec file 
Fixes: #20079
 2019-12-27 10:53:52 -05:00
Kyle Edwards 51cc3f1bff Merge topic 'FindPython-Fix-target-properties' into release-3.16 
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
 2019-12-20 12:57:07 -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 512ab500f0 CMake 3.16.2 v3.16.2 2019-12-19 09:54:31 -05:00
Brad King f9ee055d53 Merge topic 'autogen-no-hh' into release-3.16 
7fa7f55230 Autogen: Revert processing of .hh files for compatibility

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4146
 2019-12-19 09:52:33 -05:00
Brad King 4126784ce4 Merge topic 'test-resource-spec-init-lists' into release-3.16 
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
 2019-12-19 09:51:53 -05: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
Michael Dickens e8dbe4bba1 Tests: Fix testCTestResourceSpec struct initialization for some compilers 
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
 2019-12-18 05:45:08 -05:00
Brad King 7fa7f55230 Autogen: Revert processing of .hh files for compatibility 
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
 2019-12-18 05:34:27 -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 5b43aa7755 CMake 3.15.6 v3.15.6 2019-12-16 10:21:27 -05:00
Brad King dfbe8109b4 Merge topic 'pch-force-include' into release-3.16 
c5c218fa0d PCH: Append pch header file to list of forced include files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4135
 2019-12-16 10:04:03 -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 c55b4b4b24 Merge topic 'backport-3.16-vs-v142-version' into release-3.16 
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
 2019-12-13 10:31:41 -05:00
Cristian Adam c5c218fa0d PCH: Append pch header file to list of forced include files 
Fixes: #20088
 2019-12-13 15:21:27 +01: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 2f853eec3d Merge branch 'backport-3.15-vs-v142-version' into backport-3.16-vs-v142-version 2019-12-12 11:34:33 -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 4771c4e447 CMake 3.16.1 v3.16.1 2019-12-10 09:40:28 -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
Brad King b2ce834480 Merge topic 'toc_on_ppc' into release-3.16 
90d8bd2deb Merge branch 'backport-3.15-toc_on_ppc' into backport-3.16-toc_on_ppc
b35926e260 Check for support before adding bigtoc linker flag
958f858ad8 Check for support before adding bigtoc linker flag
8c7b7df788 bootstrap: Add target_link_options command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4122
 2019-12-10 09:16:20 -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 2ed1d2cfa3 Merge branch 'backport-3.15-toc_on_ppc' into release-3.15 
Merge-request: !4122
 2019-12-09 13:40:08 -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 90d8bd2deb Merge branch 'backport-3.15-toc_on_ppc' into backport-3.16-toc_on_ppc 2019-12-09 11:40:02 -05:00
Alexander Grund b35926e260 Check for support before adding bigtoc linker flag 
Fixes: #20076
 2019-12-09 11:39:12 -05:00
Alexander Grund 958f858ad8 Check for support before adding bigtoc linker flag 
Fixes: #20076
 2019-12-09 11:37:40 -05:00
Alexander Grund 8c7b7df788 bootstrap: Add target_link_options command 2019-12-09 11:37:37 -05:00
Brad King 21ba61c50c Merge topic 'unity-object-libraries' into release-3.16 
fa93b4a59b Unity: Proper handling of object libraries
5ae07e7166 Unity: Generic source file handling for all generators
f742f7ac1f Unity/PCH: Skip more target types when adding automatic sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4110
 2019-12-09 10:16:31 -05:00
Brad King 47c6b6cdee Merge topic 'pch-reuse-importlib' into release-3.16 
93becd61d1 PCH: Use the target's PREFIX for building the pdb file name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4114
 2019-12-09 10:15:19 -05:00
Cristian Adam 93becd61d1 PCH: Use the target's PREFIX for building the pdb file name 
Also copy the REUSE_FROM pdb file only if the file is newer than the
existing one.

Fixes: #19731
Fixes: #20068
 2019-12-08 20:22:34 +01:00
Cristian Adam fa93b4a59b Unity: Proper handling of object libraries 
Fixes: #20051
 2019-12-07 15:44:38 +01:00
Cristian Adam 5ae07e7166 Unity: Generic source file handling for all generators 2019-12-07 15:44:31 +01:00
Cristian Adam f742f7ac1f Unity/PCH: Skip more target types when adding automatic sources 
Besides INTERFACE_LIBRARY, skip also UTILITY and GLOBAL_TARGET
target types
 2019-12-07 14:51:34 +01:00
Brad King b4568361d2 Merge topic 'clang-analyzer-ignore-strcpy' into release-3.16 
677097ac1d TestDriver: ignore strcpy call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4116
 2019-12-06 08:38:58 -05:00
Ben Boeckel 677097ac1d TestDriver: ignore strcpy call 
clang-analyzer has a check for any use of `strcpy`. This usage is safe
because it is allocated above using the length of the string.
 2019-12-05 14:24:34 -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 684ad4296d Merge topic 'pch-xcode-no-warning' into release-3.16 
df8372da09 PCH: Do not add #pragma system_header for Xcode generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4098
 2019-12-05 11:39:24 -05:00