mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-21 21:58:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
45,547 Commits 2 Branches 401 Tags
8db38cfe3386c463ef40af8520a5df329f9fd596
Commit Graph

45547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Craig Scott fc4f00cbf6 Merge topic 'tutorial-replace-unicode-dash' into release-3.16 
02aa03eb0a Tutorial: replace Unicode EN DASH with ASCII dash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4058
 2019-11-18 05:50:02 -05:00
Arkadiusz Drabczyk 02aa03eb0a Tutorial: replace Unicode EN DASH with ASCII dash 
Unicode EN DASH is problematic:

- it cannot be easily found in web browsers, editors etc.
- it doesn't work when copied and run in the terminal
 2019-11-18 06:51:58 +11:00
Craig Scott 229f2cc5fd Help: Clarify compile features handling for OBJC and OBJCXX 2019-11-17 17:50:56 +11:00
Brad King 7d6ab5dc5b CPack: Restore support for custom package configuration templates 
Refactoring in commit 98617f1be0 (Refactor: Move CPack internal files to
`Internal/CPack/` directory, 2019-07-09, v3.16.0-rc1~449^2) accidentally
changed the public-facing names of the templates.  The name passed to
`FindTemplate` is searched in `CMAKE_MODULE_PATH` and should not change.
Remove the `Internal/CPack/` prefix on the names added by that commit.
Teach `FindTemplate` to use our builtin default directly when the
public-facing name is not found in `CMAKE_MODULE_PATH`.

Fixes: #19979
 2019-11-15 10:38:08 -05:00
Cristian Adam bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call 
Fixes: #19970
 2019-11-15 09:47:56 -05:00
Brad King f8a1b07953 Merge topic 'objc-standard-fix' into release-3.16 
6a818b6931 ObjC: Proper initialization of ObjC/XX standard properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4050
 2019-11-15 09:06:07 -05:00
Brad King 330b7b0190 Merge topic 'objc-tests' into release-3.16 
d2e5e6ff1a Tests: Organize Objective C/C++ test directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4051
 2019-11-15 09:04:40 -05:00
Brad King 8a3143bad5 Merge topic 'fix-optional-test' into release-3.16 
e8bd920df1 Tests: Fix reliance on undefined behavior of cm::optional

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4049
 2019-11-15 09:03:17 -05:00
Brad King 25d7a72a93 Merge topic 'FindPostgreSQL-macports-libsuffix' into release-3.16 
24ae45fb0c FindPostgreSQL: also search for libraries in the MacPorts suffix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4043
 2019-11-15 09:01:36 -05:00
Cristian Adam 6a818b6931 ObjC: Proper initialization of ObjC/XX standard properties 
Fix logic added by commit 81566557d5 (ObjC: Initialize ObjC/XX standard
properties from C/C++ counterparts, 2019-11-09) to account for cases
when the CXX standard is not explicitly set.  Also, do not copy the
`*_STANDARD_REQUIRED` and `*_EXTENSIONS` properties unless we copied the
`*_STANDARD` property.
 2019-11-14 11:05:56 -05:00
Brad King d2e5e6ff1a Tests: Organize Objective C/C++ test directories 
Move them all under `Tests/ObjC` and `Tests/ObjCXX`.
 2019-11-14 10:57:42 -05:00
Kyle Edwards e8bd920df1 Tests: Fix reliance on undefined behavior of cm::optional 
The test for cm::optional assumed that *opt would return a reference
to a non-constructed object if opt.has_value() is false. However, on
certain systems that build CMake with flags to harden the build,
this condition aborts rather than returning the invalid reference.
Fix this by getting the reference only when the cm::optional is
known to actually have a value.

Fixes: #19964
 2019-11-13 13:56:22 -05:00
Brad King 842605341a Merge topic 'FindwxWidgets-mingw' into release-3.16 
c921ec6112 FindwxWidgets: Add link dependencies for MinGW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4040
 2019-11-13 09:44:08 -05:00
Grant Kim c921ec6112 FindwxWidgets: Add link dependencies for MinGW 
wxWidgets on MinGW requires system libraries `uuid` and `uxtheme`.
 2019-11-13 09:42:50 -05:00
Brad King 786954c489 Merge topic 'objc-standard' into release-3.16 
81566557d5 ObjC: Initialize ObjC/XX standard properties from C/C++ counterparts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4022
 2019-11-13 09:40:47 -05:00
Brad King a0212382c9 Merge topic 'FindwxWidgets-qt' into release-3.16 
fe54989fcd FindwxWidgets: Add support for wxQt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4038
 2019-11-13 09:38:48 -05:00
Brad King a1216139f8 Merge topic 'swift-rpath-separator' into release-3.16 
a27a1c7e88 Swift: Allow build and installed RPATHs to differ

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4037
 2019-11-13 09:37:42 -05:00
Craig Scott cc88ede7a3 Help: Provide guidance on INTERFACE for target_precompile_headers() 
Fixes: #19953
 2019-11-14 00:49:31 +11:00
Craig Scott dae9a808fe Help: Reorganise target_precompile_headers() docs for readability 
Incorporates clarification of behavior when trying to specify
REUSE_FROM on a target that already has its own precompile
headers set.

Fixes: #19970
 2019-11-14 00:49:31 +11:00
Ben Boeckel 24ae45fb0c FindPostgreSQL: also search for libraries in the MacPorts suffix 2019-11-13 08:41:43 -05:00
Cristian Adam 81566557d5 ObjC: Initialize ObjC/XX standard properties from C/C++ counterparts 
Fixes: #19937
 2019-11-12 19:41:25 +01:00
Craig Sturdy fe54989fcd FindwxWidgets: Add support for wxQt 2019-11-12 10:11:07 -05:00
Saleem Abdulrasool a27a1c7e88 Swift: Allow build and installed RPATHs to differ 
Define the RPATH separator to `:` so that CMake can reserve room to edit
the ELF RPATH at install time.  This enables the use of `BUILD_RPATH` and
`INSTALL_RPATH` with differing values.
 2019-11-12 10:02:06 -05:00
Kyle Edwards 28bc41ca62 Merge topic 'add_custom_command-supports-COMMAND_EXPAND_LISTS' into release-3.16 
64f40c5d09 Help: Both add_custom_command signatures support COMMAND_EXPAND_LISTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4036
 2019-11-12 10:02:01 -05:00
Brad King eae743bf17 Merge topic 'unity-HEADER_FILE_ONLY' into release-3.16 
9a5418320e Unity: Don't include sources with HEADER_FILE_ONLY property set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4023
 2019-11-12 09:51:15 -05:00
Brad King 88e0dca40d Merge topic 'objc-standard-docs' into release-3.16 
665954fa8d ObjC: Document ObjC/ObjCXX standard properties / variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4031
 2019-11-12 09:47:44 -05:00
Brad King b197d20c08 Merge topic 'objc-xcode-flags' into release-3.16 
bb42e1ed43 ObjC: Add OBJC/OBJCXX flags to Xcode projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4020
 2019-11-12 09:43:11 -05:00
Brad King c4708c5928 Merge topic 'update-expat' into release-3.16 
50bc359184 expat: Update CMake build for 2.2.9
b63a5c88a2 Merge branch 'upstream-expat' into update-expat
1712885b4f expat 2019-09-25 (a7bc26b6)
512fabaa9d expat: Update script to get Expat 2.2.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4032
 2019-11-12 09:38:21 -05:00