mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 23:28:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
40,157 Commits 2 Branches 401 Tags
71e0961a747e3918d762c29febe43deaf009090f
Commit Graph

40157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot 71e0961a74 CMake Nightly Date Stamp 2018-07-21 00:01:12 -04:00
Craig Scott e3664debd2 Merge topic 'doc-find_package-root' 
492ade276b Help: Add explicit <PackageName>_ROOT variable documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2225
 2018-07-20 18:58:43 -04:00
Brad King 492ade276b Help: Add explicit <PackageName>_ROOT variable documentation 
Add documentation for both the CMake variable and environment variable
of this name pattern.  Update references to these names to link to their
documents.  Clarify the pattern used to construct their names.
 2018-07-20 09:43:08 -04:00
Brad King 01c04e4297 Merge topic 'xcode-target-order' 
fb45559e09 Xcode: Process targets in depth-first order during generation
0bad9eba46 Xcode: Refactor storage of ordered list of targets
d0de296e50 Xcode: Factor target generation loop body into helper method
30e27b4110 Xcode: Compute global order index for targets
e3469a5920 Xcode: Remove loop over local generators that has no effect

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2224
 2018-07-20 07:40:35 -04:00
Kitware Robot 56148cb98f CMake Nightly Date Stamp 2018-07-20 00:01:06 -04:00
Brad King fb45559e09 Xcode: Process targets in depth-first order during generation 
The Xcode 10 "new build system" requires more strict handling of custom
commands.  It may need a fix similar to what commit v3.12.0-rc1~171^2
(VS: Generate a custom command only in the least dependent target,
2018-03-23) did for VS.  Prepare for this by generating targets within
each local generator in dependency order.

Issue: #18070
 2018-07-19 13:40:54 -04:00
Brad King 0bad9eba46 Xcode: Refactor storage of ordered list of targets 
Sort the resulting Xcode object list so that the actual order of
generation does not matter.
 2018-07-19 13:20:28 -04:00
Brad King d0de296e50 Xcode: Factor target generation loop body into helper method 2018-07-19 13:20:28 -04:00
Brad King 30e27b4110 Xcode: Compute global order index for targets 
Compute an index for each target in a global ordering such that no
target comes before its dependencies.
 2018-07-19 13:20:28 -04:00
Brad King e3469a5920 Xcode: Remove loop over local generators that has no effect 
Remove a loop over local generators whose body was dropped long ago by
commit v2.6.0~1677 (Remove unused build rules from Xcode, 2007-05-28).
 2018-07-19 13:20:27 -04:00
Brad King 8dc86970c8 Merge topic 'cpack_archive_typo' 
22fbf39d9b CPack: Fix log typos (spaces in the wrong places)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2222
 2018-07-19 07:11:02 -04:00
Brad King 16879c3960 Merge branch 'release-3.12' 2018-07-19 07:09:47 -04:00
Brad King af041b71f7 Merge topic 'tcl-8.7' 
bec3be11b9 FindTCL: Add support for version 8.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2223
 2018-07-19 07:09:03 -04:00
Brad King 018c373f35 Merge topic 'UseSWIG-csharp-conditional' 
ed289e0577 UseSWIG: Use CSharp language only if it is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ram-Z <me@rmz.io>
Acked-by: Marc Chevrier <marc.chevrier@gmail.com>
Merge-request: !2219
 2018-07-19 07:08:31 -04:00
Brad King a35eafdb22 Merge topic 'csharp-compiler-loaded' 
c3ea50ede1 CSharp: Set CMAKE_CSharp_COMPILER_LOADED variable when language is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2220
 2018-07-19 07:07:53 -04:00
Kitware Robot cadec7db37 CMake Nightly Date Stamp 2018-07-19 00:01:07 -04:00
Brad King 8cefa2cba4 Merge branch 'tcl-8.7' into release-3.12 
Merge-request: !2223
 2018-07-18 13:10:12 -04:00
Dima Panov bec3be11b9 FindTCL: Add support for version 8.7 
Fixes: #18186
 2018-07-18 13:08:34 -04:00
Sylvain Joubert 22fbf39d9b CPack: Fix log typos (spaces in the wrong places) 2018-07-18 17:15:52 +02:00
Brad King 19fac8572a Merge topic 'doc-regex-notes' 
4b35dab891 Help: Document how escape sequences work in a regex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2221
 2018-07-18 11:10:02 -04:00
Brad King 4b35dab891 Help: Document how escape sequences work in a regex 
Our regex engine doesn't interpret `\`-escapes but CMake language escape
sequences may be used to pass literal whitespace characters to it.
 2018-07-18 10:36:00 -04:00
Brad King 11d71e6cd0 Merge topic 'remove-simpleinstall' 
31e79050b2 Tests: Remove the SimpleInstall test
36ef57a939 Tests: Add test for cmake --build . --target package
11ca374b28 Tests: Add test for install(SCRIPT ... COMPONENT)
2201fb6f43 Tests: Add test for InstallRequiredSystemLibraries
5a7a006fdd Tests: Add test for $<0:...> in ExportImport
69ca768e78 Tests: Add test for install(TARGETS) RPATH functionality
25c3fb6c35 Tests: Add test for install(FILES) with PERMISSIONS
b5df4faa20 Tests: Add test for installing parts of targets in different directories
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2209
 2018-07-18 09:12:39 -04:00
Brad King 0ab23b9a1e Merge topic 'nvcc_dlink_dedup_static_libs' 
fd0523a215 CUDA: Properly de-duplicate libs when doing device linking
b07c71831c CUDA: Add a test to verify device linking can handle circular deps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2214
 2018-07-18 09:07:53 -04:00
Brad King 4436be337d Merge branch 'UseSWIG-csharp-conditional' into release-3.12 
Merge-request: !2219
 2018-07-18 09:03:50 -04:00
Brad King 59af434946 Merge branch 'csharp-compiler-loaded' into release-3.12 
Merge-request: !2220
 2018-07-18 09:03:37 -04:00
Brad King ed289e0577 UseSWIG: Use CSharp language only if it is enabled 
In commit v3.12.0-rc1~2^2 (UseSWIG: Add CSHARP variant for wrapper
files, 2018-06-08) we explicitly marked swig-generated `.cs` files as
`LANGUAGE` CSharp so that the resulting sources can be compiled.
However, this works only when the CSharp language has been enabled.

Fixes: #18184
 2018-07-18 08:53:32 -04:00
Brad King c3ea50ede1 CSharp: Set CMAKE_CSharp_COMPILER_LOADED variable when language is enabled 
We already do this for C, CXX, Fortran, etc.
 2018-07-18 08:53:32 -04:00
Kitware Robot 5d550b2772 CMake Nightly Date Stamp 2018-07-18 00:01:05 -04:00
Robert Maynard fd0523a215 CUDA: Properly de-duplicate libs when doing device linking 
The nvcc device linker is designed so that each static library
with device symbols only needs to be listed once as it doesn't
care about link order. If you provide the same static library
multiple times it will error out. To make sure this occurs
we find the unique set of link items.
 2018-07-17 10:42:57 -04:00
Robert Maynard b07c71831c CUDA: Add a test to verify device linking can handle circular deps 2018-07-17 10:04:39 -04:00
Kyle Edwards 31e79050b2 Tests: Remove the SimpleInstall test 
The cases that were covered by SimpleInstall have been moved into
RunCMake.install.
 2018-07-17 09:07:10 -04:00
Kyle Edwards 36ef57a939 Tests: Add test for cmake --build . --target package 2018-07-17 09:07:10 -04:00
Kyle Edwards 11ca374b28 Tests: Add test for install(SCRIPT ... COMPONENT) 2018-07-17 09:07:10 -04:00
Kyle Edwards 2201fb6f43 Tests: Add test for InstallRequiredSystemLibraries 2018-07-17 09:07:10 -04:00
Kyle Edwards 5a7a006fdd Tests: Add test for $<0:...> in ExportImport 
This test case already includes test cases for $<1...> and $<0...>,
but this commit adds a few $<0:...>'s in cases where it was missing.
 2018-07-17 09:07:02 -04:00
Kyle Edwards 69ca768e78 Tests: Add test for install(TARGETS) RPATH functionality 2018-07-17 09:07:01 -04:00
Kyle Edwards 25c3fb6c35 Tests: Add test for install(FILES) with PERMISSIONS 2018-07-17 09:07:01 -04:00
Kyle Edwards b5df4faa20 Tests: Add test for installing parts of targets in different directories 2018-07-17 09:07:01 -04:00
Kyle Edwards 4108ab4be2 Tests: Add test for install(DIRECTORY) with PATTERN and REGEX 2018-07-17 09:07:01 -04:00
Kyle Edwards bce8fa229a Tests: Add test for CONFIGURATIONS parameter of install() 2018-07-17 09:07:01 -04:00
Kyle Edwards ae1c917f1a Tests: Add test for install(<SCRIPT|CODE>) 2018-07-17 09:07:01 -04:00
Kyle Edwards 2c62a45a5a Tests: Add test for <PRE|POST>_INSTALL_SCRIPT 2018-07-17 09:07:01 -04:00
Kyle Edwards db4bc2fa18 Tests: Add test for deprecated install_*() commands 2018-07-17 09:07:01 -04:00
Kyle Edwards ec5c838fcb Tests: Add tests for *OUTPUT_NAME properties 2018-07-17 09:07:00 -04:00
Kyle Edwards f6c7358c2a Tests: Add test for install(DIRECTORY ... OPTIONAL) 2018-07-17 09:07:00 -04:00
Kyle Edwards 1638ffa287 Tests: Add tests for install(<TARGETS|FILES> ... OPTIONAL) 2018-07-17 09:07:00 -04:00
Brad King f84bcc1bf5 Merge branch 'release-3.12' 2018-07-17 08:36:25 -04:00
Brad King f84c15ef2f CMake 3.12.0 v3.12.0 2018-07-17 07:18:36 -04:00
Brad King 7ebc06fb02 Merge topic 'math-err' 
406f397e8b math: Restore toleration of unexpected characters in an expression
dd5c54600b cmExprParserHelper: Simplify error state tracking
185bcface4 cmExprParserHelper: Remove some unused code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2218
 2018-07-17 07:14:48 -04:00
Brad King e78fc81d4a Merge topic 'FindProtobuf-upstream-impl' 
71d99e156b Protobuf: restore previous output directory
2ae2d0bd3e Protobuf: restore 'DESCRIPTORS' support
1385b4b113 Protobuf: restore 'PROTOBUF_IMPORT_DIRS' check
1bcc0f3678 Protobuf: use upstream implementation to generate cpp and python files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2212
 2018-07-17 07:13:18 -04:00