mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-30 11:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
45,575 Commits 2 Branches 401 Tags
d8d4924d982311477225ca73f15442c9410ef7ed
Commit Graph

45575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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
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
Kyle Edwards 85fb95562b Merge topic 'ctest-spec-file-version-test' into release-3.16 
59df85194e CTest Resource Allocation: Add test for spec file with no version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4092
 2019-11-27 22:48:19 -05:00
Kyle Edwards 59df85194e CTest Resource Allocation: Add test for spec file with no version 2019-11-26 11:41:56 -05:00
Brad King 1b4482f65d CMake 3.16.0 v3.16.0 2019-11-26 09:18:07 -05:00
Brad King b1175431c3 Merge topic 'ctest-resource-fixes' into release-3.16 
a033bafbe0 Help: Clarify how tests are run if no resource spec file is specified
a64ba0235f CTest: Clarify that resource requirements can be split
f9f294f5fa CTest: Add version field to resource spec file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4080
 2019-11-26 09:12:33 -05:00
Kyle Edwards a033bafbe0 Help: Clarify how tests are run if no resource spec file is specified 
Fixes: #19985
 2019-11-26 09:10:22 -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 557ceacf82 Merge topic 'unity-no-duplicate-path' into release-3.16 
43ffd2c35c Unity: No repeated path for internal generated unity files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4077
 2019-11-26 08:55:09 -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
Kyle Edwards a64ba0235f CTest: Clarify that resource requirements can be split 
Add a note to the documentation to clarify this, and add test cases
to ensure it.

Fixes: #19987
 2019-11-25 11:08:27 -05:00
Kyle Edwards f9f294f5fa CTest: Add version field to resource spec file 
Fixes: #20007
 2019-11-25 11:08:27 -05:00
Brad King 99f0881d8c Merge topic 'FindwxWidgets-rel-and-dbg' into release-3.16 
a5bb08a8c0 FindwxWidgets: Fix finding both release and debug libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4079
 2019-11-25 09:38:07 -05:00
Cristian Adam 43ffd2c35c Unity: No repeated path for internal generated unity files 
Fixes: #20002
 2019-11-25 13:33:44 +01: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
Brad King 602f2118b0 Merge topic 'xcode-objc' into release-3.16 
1e68fb0c91 Xcode: Set source file type for Objective C/C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4073
 2019-11-21 11:27:25 -05:00
Brad King 2a2c890023 Merge topic 'FindwxWidgets-qt-debug' into release-3.16 
84408ff402 FindwxWidgets: Find wxQt debug libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4069
 2019-11-21 11:00: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 1e68fb0c91 Xcode: Set source file type for Objective C/C++ 
Fixes: #19998
 2019-11-20 09:43:00 -05:00
Brad King d25d75687d CMake 3.16.0-rc4 v3.16.0-rc4 2019-11-18 13:44:31 -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
Saleem Abdulrasool ff6c336127 Swift: support -rpath on Darwin 
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.
 2019-11-18 10:04:09 -05:00
Saleem Abdulrasool f935de6746 Swift: support INSTALL_NAME_DIR on Darwin 
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.
 2019-11-18 10:02:50 -05:00
Brad King e64d39eb42 Merge topic 'compile-features-other-lang' into release-3.16 
229f2cc5fd Help: Clarify compile features handling for OBJC and OBJCXX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4057
 2019-11-18 09:54:15 -05:00
Brad King 1c09b8c164 Merge topic 'cpack-custom-templates' into release-3.16 
7d6ab5dc5b CPack: Restore support for custom package configuration templates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4054
 2019-11-18 09:50:57 -05:00
Brad King 667a88e260 Merge topic 'docs-pch-reorg' into release-3.16 
cc88ede7a3 Help: Provide guidance on INTERFACE for target_precompile_headers()
dae9a808fe Help: Reorganise target_precompile_headers() docs for readability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4045
 2019-11-18 09:47:35 -05:00
Brad King 6cb9867ba3 Merge topic 'pch-reuse-no-prop' into release-3.16 
bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4046
 2019-11-18 09:46:26 -05:00