mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
45,819 Commits 2 Branches 385 Tags
34b7dbbfc37180989b57a0fb25ca4e0010cf992b
Commit Graph

45819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
34b7dbbfc3 LexerParser: Regenerate parsers with bison 3.4.2 2019-11-13 11:29:48 -05:00
Brad King
011693867a Merge branch 'release-3.16' 2019-11-13 09:44:09 -05:00
Brad King
1257fc91ff Merge topic 'FindwxWidgets-mingw' 
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
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
cad199d4b2 Merge topic 'tag-std-string' 
64843b1737 cmVisualStudio10TargetGenerator: use std::string for tag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4026
 2019-11-13 09:42:02 -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
3c0428906a Merge branch 'release-3.16' 2019-11-13 09:40:47 -05:00
Brad King
4909594abd Merge topic 'objc-standard' 
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
c104c3eec2 Merge branch 'release-3.16' 2019-11-13 09:38:49 -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
444461c97c Merge topic 'FindwxWidgets-qt' 
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
314c9c143d Merge branch 'release-3.16' 2019-11-13 09:37:43 -05:00
Brad King
e42c018642 Merge topic 'swift-rpath-separator' 
a27a1c7e88 Swift: Allow build and installed RPATHs to differ

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4037
 2019-11-13 09:37:43 -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
Kitware Robot
e49d85ae4b CMake Nightly Date Stamp 2019-11-13 00:01:10 -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
Kyle Edwards
aa3b99d580 Merge branch 'release-3.16' 2019-11-12 10:02:01 -05:00
Kyle Edwards
7e62ffc028 Merge topic 'add_custom_command-supports-COMMAND_EXPAND_LISTS' 
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
ccd2c2824a Merge topic 'modernize-memory-management' 
f93385283f cmLocalGenerator: modernize memory management
101b5288ff cmAlgorithm: Extend cmAppend capabilities

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4028
 2019-11-12 09:55:20 -05:00
Brad King
aec81b301e Merge topic 'findcuda_stop_exposing_raw_pthreads_lib' 
46371132b3 FindCUDA: CUDA_LIBRARIES doesn't contain raw `-pthread`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4035
 2019-11-12 09:53:42 -05:00
Brad King
f59ae1a698 Merge topic 'cpack-pkg-background' 
e6069613a1 CPack: Set background image in macOS installer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3995
 2019-11-12 09:52:32 -05:00
Brad King
cea7f88a54 Merge branch 'release-3.16' 2019-11-12 09:51:16 -05:00
Brad King
5b46bc3194 Merge topic 'unity-HEADER_FILE_ONLY' 
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:16 -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
45f8b10e0c Merge branch 'release-3.16' 2019-11-12 09:47:44 -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
55f7df4961 Merge topic 'objc-standard-docs' 
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
2af4841428 Merge branch 'release-3.16' 2019-11-12 09:43:12 -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
43ef704d51 Merge topic 'objc-xcode-flags' 
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
44f4042f89 Merge branch 'release-3.16' 2019-11-12 09:38:22 -05:00
Brad King
11c83957ac Merge topic 'update-expat' 
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:22 -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
Brad King
2644ea3c21 Merge branch 'release-3.16' 2019-11-12 09:36:55 -05:00
Brad King
f90c351e60 Merge topic 'reference-IMPORTED_IMPLIB-more' into release-3.16 
2944bf46d5 Help: Reference IMPORTED_IMPLIB from the IMPORTED_LOCATION documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4034
 2019-11-12 09:36:55 -05:00
Brad King
df3baee8ff Merge topic 'reference-IMPORTED_IMPLIB-more' 
2944bf46d5 Help: Reference IMPORTED_IMPLIB from the IMPORTED_LOCATION documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4034
 2019-11-12 09:36:55 -05:00
Brad King
ffa9965700 Merge topic 'pch-cray-classic' into release-3.16 
77a8f9ecbc Tests: Fix ExportImport PCH expectation on Cray Classic compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4033
 2019-11-12 09:35:38 -05:00
Brad King
ace0591473 Merge branch 'release-3.16' 2019-11-12 09:35:38 -05:00
Brad King
e2c3da8d4b Merge topic 'pch-cray-classic' 
77a8f9ecbc Tests: Fix ExportImport PCH expectation on Cray Classic compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4033
 2019-11-12 09:35:38 -05:00
Brad King
1ade15e1a3 Merge branch 'release-3.16' 2019-11-12 09:34:12 -05:00
Brad King
7a08f0d8dd Merge topic 'resolve-full-path-at-generate-time' into release-3.16 
48d1456b3d UnityBuild: Resolve full paths of unity source includes
ec2f130aa9 cmFileAPI: Resolve full path in PCH source comparison

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4029
 2019-11-12 09:34:11 -05:00
Brad King
a085648de5 Merge topic 'resolve-full-path-at-generate-time' 
48d1456b3d UnityBuild: Resolve full paths of unity source includes
ec2f130aa9 cmFileAPI: Resolve full path in PCH source comparison

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4029
 2019-11-12 09:34:11 -05:00
Craig Scott
c96ba58a5b Merge branch 'release-3.16' 2019-11-12 08:28:47 -05:00
Craig Scott
cba091d3a9 Merge topic 'pch-no-duplicates' into release-3.16 
e01935ac9d PCH: No repeated path for internal generated PCH files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4030
 2019-11-12 08:28:46 -05:00
Craig Scott
9a935adca9 Merge topic 'pch-no-duplicates' 
e01935ac9d PCH: No repeated path for internal generated PCH files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4030
 2019-11-12 08:28:46 -05:00
Craig Scott
bec38523de Merge branch 'release-3.16' 2019-11-12 08:16:32 -05:00