mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-03 04:03:23 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Craig Scott 00f5e02060 Merge topic 'remove-CPACK_INSTALL_CMAKE_CONFIGURATIONS' into release-3.16 
1d1fa5d3e4 Tests: Add RunCMake.CPackCommandLine case for multi-config package
108207cc84 CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4025
 2019-11-12 08:16:31 -05:00
Craig Scott 27020c81d5 Merge topic 'remove-CPACK_INSTALL_CMAKE_CONFIGURATIONS' 
1d1fa5d3e4 Tests: Add RunCMake.CPackCommandLine case for multi-config package
108207cc84 CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4025
 2019-11-12 08:16:31 -05:00
Kitware Robot 2dcd7ce4ba CMake Nightly Date Stamp 2019-11-12 00:01:07 -05:00
Brad King 1d1fa5d3e4 Tests: Add RunCMake.CPackCommandLine case for multi-config package 
In commit da5ac4bb60 (cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS`
variable, 2019-07-10, v3.16.0-rc1~165^2) we added support for running
the `cpack -C ...` command-line with multiple configurations.  Add an
explicit test for this.

Fixes: #19918
 2019-11-11 14:16:48 -05:00
Alex Turbov 108207cc84 CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS 
In commit da5ac4bb60 (cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS`
variable, 2019-07-10, v3.16.0-rc1~165^2) we added both the variable
and support for `cpack -C` with multiple configurations.  Drop the
variable because the `package` target cannot ensure that all of the
configurations are built.  Keep the command-line interface so that
it can be used manually in scripts.

Fixes: #19918
 2019-11-11 14:15:09 -05:00
Marc Aldorasi 64f40c5d09 Help: Both add_custom_command signatures support COMMAND_EXPAND_LISTS 2019-11-11 13:07:11 -05:00
Robert Maynard 46371132b3 FindCUDA: CUDA_LIBRARIES doesn't contain raw -pthread 
If a person tried to pass `CUDA_LIBRARIES` to nvcc compiler it could
fail as it might have `-pthread` which nvcc doesn't support. Instead
we now use the `Threads::Threads` so that nvcc gets the correct
`-Xcompiler -pthread` flag.
 2019-11-11 11:52:02 -05:00
Cristian Adam bb42e1ed43 ObjC: Add OBJC/OBJCXX flags to Xcode projects 
Fixes: #19936
 2019-11-11 17:43:17 +01:00
Marc Aldorasi 2944bf46d5 Help: Reference IMPORTED_IMPLIB from the IMPORTED_LOCATION documentation 
Issue: #16698
 2019-11-11 11:26:30 -05:00
Brad King 77a8f9ecbc Tests: Fix ExportImport PCH expectation on Cray Classic compiler 
Do not expect PCH-included definitions for this compiler.
 2019-11-11 11:18:35 -05:00
Brad King 50bc359184 expat: Update CMake build for 2.2.9 2019-11-11 10:44:17 -05:00
Brad King b63a5c88a2 Merge branch 'upstream-expat' into update-expat 
* upstream-expat:
  expat 2019-09-25 (a7bc26b6)
 2019-11-11 10:42:32 -05:00
Marc Chevrier f93385283f cmLocalGenerator: modernize memory management 2019-11-11 16:41:13 +01:00
Expat Upstream 1712885b4f expat 2019-09-25 (a7bc26b6) 
Code extracted from:

    https://github.com/libexpat/libexpat.git

at commit a7bc26b69768f7fb24f0c7976fae24b157b85b13 (R_2_2_9).
 2019-11-11 10:38:19 -05:00
Brad King 512fabaa9d expat: Update script to get Expat 2.2.9 2019-11-11 10:38:13 -05:00
Brad King 5e328c6d74 Merge topic 'objc-trycompile' into release-3.16 
7447aa4b34 ObjC: Add try_compile support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4006
 2019-11-11 10:25:47 -05:00
Brad King 95555d95aa Merge branch 'release-3.16' 2019-11-11 10:25:47 -05:00
Brad King ac7f41d20e Merge topic 'objc-trycompile' 
7447aa4b34 ObjC: Add try_compile support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4006
 2019-11-11 10:25:47 -05:00
Brad King 8bfd4447eb Merge topic 'objc-link-main' into release-3.16 
db91c5f776 ObjC: Set same settings for all languages supported on Darwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4012
 2019-11-11 10:24:02 -05:00
Brad King 19aadc03ef Merge branch 'release-3.16' 2019-11-11 10:24:02 -05:00