mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 08:08:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
40,133 Commits 2 Branches 401 Tags
22fbf39d9ba968a4827cb1580dbbe11e4a8a0619
Commit Graph

40133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvain Joubert 22fbf39d9b CPack: Fix log typos (spaces in the wrong places) 2018-07-18 17:15:52 +02: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
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
Brad King e08f02b928 Merge topic 'hex_file' 
5f431789a9 Use isxdigit() to determine if a character is a hex digit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2213
 2018-07-17 07:12:29 -04:00
Brad King 689ce111a8 Merge topic 'FindOpenCL-arch-paths' 
dee7bafb13 FindOpenCL: Search per-architecture path suffixes on UNIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2215
 2018-07-17 07:11:38 -04:00
Kitware Robot 328410f26b CMake Nightly Date Stamp 2018-07-17 00:01:08 -04:00
Brad King 406f397e8b math: Restore toleration of unexpected characters in an expression 
Prior to commit 7c4c13ffef (math: Reject unexpected expression input
explicitly, 2018-05-18) we ignored unexpected characters in an
expression that otherwise can be parsed.  In order to preserve
compatibility with projects that accidentally used this, convert the
error to a warning.
 2018-07-16 14:46:43 -04:00
Brad King dd5c54600b cmExprParserHelper: Simplify error state tracking 
Errors always have explanation strings, so use the presence of such a
string to track whether an error has occurred.  This avoids an extra
variable.
 2018-07-16 13:04:06 -04:00
Brad King 185bcface4 cmExprParserHelper: Remove some unused code 2018-07-16 11:12:34 -04:00
Brad King de342066d3 Merge branch 'release-3.12' 2018-07-16 09:07:38 -04:00
Brad King 42065828c3 Merge topic 'doc-add_library-IMPORTED_OBJECTS' 
62b4df1e84 Help: Mention IMPORTED_OBJECTS in add_library docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2216
 2018-07-16 09:07:23 -04:00
André Apitzsch 71d99e156b Protobuf: restore previous output directory 
The protobuf upstream implementation has a different default output
directory.  Restore our original output directory for compatibility.
 2018-07-16 08:59:36 -04:00
André Apitzsch 2ae2d0bd3e Protobuf: restore 'DESCRIPTORS' support 
This was not present in the upstream code.
 2018-07-16 08:59:33 -04:00
André Apitzsch 1385b4b113 Protobuf: restore 'PROTOBUF_IMPORT_DIRS' check 
This was not present in the upstream code.
 2018-07-16 08:59:21 -04:00
André Apitzsch 1bcc0f3678 Protobuf: use upstream implementation to generate cpp and python files 
Generate functions are taken from [1] and [2].  The license [3] is
already covered by our BSD-3 license for CMake and our inclusion of
"Google Inc" in `Copyright.txt`.

[1] https://github.com/google/protobuf/blob/93f6b67e/cmake/protobuf-config.cmake.in
[2] https://github.com/google/protobuf/blob/93f6b67e/cmake/protobuf-module.cmake.in
[3] https://github.com/google/protobuf/blob/93f6b67e/LICENSE
 2018-07-16 08:57:08 -04:00
Anton Myagkov dee7bafb13 FindOpenCL: Search per-architecture path suffixes on UNIX 
Use different path suffixes to find opencl for x86 and x86_64.
We already do this on Windows.
 2018-07-16 08:27:08 -04:00
Brad King 4b00e57de8 Merge topic 'FindXercesC-versioned-names' 
82f39c9ce9 FindXercesC: Search for version-named library files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Roger Leigh <rleigh@codelibre.net>
Merge-request: !2210
 2018-07-16 08:21:55 -04:00
Brad King d240bb9a41 Merge branch 'doc-add_library-IMPORTED_OBJECTS' into release-3.12 
Merge-request: !2216
 2018-07-16 08:19:35 -04:00
Brad King 62b4df1e84 Help: Mention IMPORTED_OBJECTS in add_library docs 
The `IMPORTED_OBJECTS` is to object libraries as `IMPORTED_LOCATION`
is to normal libraries.

Fixes: #18176
 2018-07-16 08:17:51 -04:00
Kitware Robot 992e9d10f8 CMake Nightly Date Stamp 2018-07-16 00:01:04 -04:00
Kitware Robot 1a1eeda75a CMake Nightly Date Stamp 2018-07-15 00:01:05 -04:00
Kitware Robot c960907105 CMake Nightly Date Stamp 2018-07-14 00:01:13 -04:00
Devin Nakamura 5f431789a9 Use isxdigit() to determine if a character is a hex digit 
Replace custom cm_IsHexChar with isxdigit from the stdlib
 2018-07-13 13:55:39 -04:00
Raul Metsma 82f39c9ce9 FindXercesC: Search for version-named library files 
Use the version number extracted from the header file to construct
versioned library names.  This approach is already used by `FindXalanC`.

Signed-off-by: Raul Metsma <raul@metsma.ee>
 2018-07-13 09:01:47 -04:00
Brad King 102f51d0aa Merge topic 'autogen_forward_errors' 
86b332c25d Return std::string from cmGeneratorTarget::ImportedGetLocation
189f723509 Autogen: Wrap moc/uic/rcc related variables in structs
c6a8002827 Autogen: Improve error detection during configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2207
 2018-07-13 08:57:36 -04:00
Brad King f691dbc485 Merge topic 'cpack-wix-extra-sources' 
f2134169f6 WiX: Add the build directory to IncludeSearchPaths for candle.exe

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2194
 2018-07-13 08:57:09 -04:00
Brad King 969ad5b33e Merge branch 'release-3.12' 2018-07-13 08:55:33 -04:00