mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
40,388 Commits 2 Branches 401 Tags
31301b46a726e8c95836e885bb8a7f5cc5221c49
Commit Graph

5763 Commits

Author SHA1 Message Date
Brad King ce153cacc7 Merge topic 'static-lib-options' 
974de0e199 static library: add property STATIC_LIBRARY_OPTIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2290
 2018-08-27 14:04:22 -04:00
Brad King 9903ec1677 Merge topic 'ninja-generator-do-not-add-alias-matching-custom-command-output' 
180c2f8de8 Ninja: Fix dupbuild error skipping alias with conflicting custom command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Isaiah <isaiah.norton@gmail.com>
Merge-request: !2276
 2018-08-27 13:57:05 -04:00
Brad King 36f49faa3c Merge topic 'cuda-no-cublas_device' 
122c79748c CUDA: Avoid using deprecated cublas_device to identify device lib dirs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2296
 2018-08-24 13:35:01 -04:00
Robert Maynard 122c79748c CUDA: Avoid using deprecated cublas_device to identify device lib dirs 
Use `curand_static` to identify directories containing device libraries
because `cublas_device` is deprecated and will be removed in the future.

Issue: #18290
 2018-08-23 14:43:31 -04:00
Craig Scott 6b1089399a Merge topic 'export-properties-undefined' 
dbd3e2c53d EXPORT_PROPERTIES: Prevent null dereference for undefined property
b88bf6796e EXPORT_PROPERTIES: Add test for an undefined property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2294
 2018-08-17 20:51:17 -04:00
Craig Scott b88bf6796e EXPORT_PROPERTIES: Add test for an undefined property 
The added test verifies that a property listed in EXPORT_PROPERTIES
can be undefined. It confirms the crash recorded in issue #18260.
 2018-08-16 22:21:25 +10:00
Marc Chevrier 974de0e199 static library: add property STATIC_LIBRARY_OPTIONS 
issue: #18251
 2018-08-15 15:20:18 +02:00
Marc Chevrier 174721ecc0 LINK_OPTIONS property: add test for static library. 
Check that property INTERFACE_LINK_OPTIONS is correctly propagated
from static libraries.

Issue: #18251
 2018-08-15 14:40:36 +02:00
Craig Scott 349f8bfb25 Merge topic 'doc-consistently-reference-packagename' 
30d08bdce9 doc: Consistently use <PackageName> for describing the name of a package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2283
 2018-08-15 08:18:49 -04:00
Craig Scott a6f7a01f3a Merge topic 'better_static_link_flags_docs' 
6b17d85873 Help: Document when LINK_FLAGS and STATIC_LIBRARY_FLAGS are used
9561d42f95 target_link_options: Add test to verify static library behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2274
 2018-08-15 07:58:39 -04:00
Jean-Christophe Fillion-Robin 30d08bdce9 doc: Consistently use <PackageName> for describing the name of a package 2018-08-14 20:54:56 +10:00
Brad King 0077c8c263 Merge topic 'test_MocOsMacros_fix' 
52676e3794 Autogen: Tests: Use non inverting Qt version tests
e7fb85d00d Autogen: Check if we can run the MocOsMacros test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2270
 2018-08-10 10:50:46 -04:00
Jean-Christophe Fillion-Robin 180c2f8de8 Ninja: Fix dupbuild error skipping alias with conflicting custom command 
See-also: https://issues.slicer.org/view.php?id=4595

Reported-by: Isaiah Norton <inorton@bwh.harvard.edu>
 2018-08-09 13:32:23 -04:00
Robert Maynard 9561d42f95 target_link_options: Add test to verify static library behavior 
Issue: #18251
 2018-08-09 12:52:44 -04:00
Sebastian Holtermann 52676e3794 Autogen: Tests: Use non inverting Qt version tests 2018-08-09 15:44:11 +02:00
Robert Maynard 4d384d290e Help: Document the $CACHE{} syntax 
Also add a test case for the behavior.
 2018-08-07 13:13:27 -04:00
Sebastian Holtermann e7fb85d00d Autogen: Check if we can run the MocOsMacros test 
The MocOsMacros test requires moc to support moc_predefs.h
on some platforms (e.g. Mac). moc supports moc_predefs.h
inclusion since Qt 5.8, therefore run the MocOsMacros only if
Qt >= 5.8 and if CMAKE_CXX_COMPILER_PREDEFINES_COMMAND is
defined.

Fixes #18245
 2018-08-07 16:33:27 +02:00
Gregor Jasny 6b7f1e1db0 Xcode: Add variables and properties to configure schemes 
Add `XCODE_SCHEME_*` target properties and associated variables
`CMAKE_XCODE_SCHEME_*` to initialize them on target creation.
Map each target property value to an associated Xcode scheme entry.

Co-Author: Martin Sander <mail@martin-sander.de>
Fixes: #17919
 2018-08-01 09:12:42 -04:00
Sebastian Holtermann 7bb70054e4 Autogen: Add test for Q_OS_ macros 2018-07-30 09:46:03 +02:00
Craig Scott 2af5307317 Merge branch 'cpack-default-package-version-zero' into release-3.12 
Merge-request: !2239
 2018-07-29 19:44:24 +10:00
Craig Scott 50e40b7eec Merge topic 'cpack-default-package-version-zero' 
ed015bde2b CPack: Restore support for 0-valued version components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2239
 2018-07-29 05:40:37 -04:00
Brad King 5bbcf76399 Merge topic 'UseSWIG-target-name-policy' 
a3a0c3aa71 UseSWIG: add policy to manage target naming strategy.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2232
 2018-07-27 10:08:54 -04:00
Brad King bccbf9a737 Merge topic 'reproducible-tarballs' 
548ac51d8e CPack/Deb: Support SOURCE_DATE_EPOCH when packaging files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2226
 2018-07-27 10:06:44 -04:00
Brad King ed015bde2b CPack: Restore support for 0-valued version components 
In commit v3.12.0-rc1~136^2 (CPack: Use project version as default for
`CPACK_PACKAGE_VERSION`, 2018-04-29) we did not account for the value of
`CMAKE_PROJECT_VERSION_{MAJOR,MINOR,PATCH}` having `0`.  Fix the logic
to distinguish between unprovided version components and `0` components.

While at it, add a test case covering the behavior described in the
documentation by the original commit.  The number of version components
in the package name should match those provided to the `project()`
command `VERSION` option.

Fixes: #18199
 2018-07-27 10:01:29 -04:00
Andrew Fuller 548ac51d8e CPack/Deb: Support SOURCE_DATE_EPOCH when packaging files 2018-07-25 13:39:07 -07:00
Marc Chevrier a3a0c3aa71 UseSWIG: add policy to manage target naming strategy. 2018-07-25 18:00:52 +02:00
Craig Scott 5041298893 Merge branch 'project-injected-no-cmp0048' into release-3.12 2018-07-25 22:24:29 +10:00
Craig Scott ae2b12a95c Merge topic 'project-injected-no-cmp0048' 
6646771b0f project: Do not issue CMP0048 warnings on injected call
08eb157c03 Tests: Add case showing CMP0048 warning on injected project command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2235
 2018-07-25 08:15:02 -04:00
Brad King 6646771b0f project: Do not issue CMP0048 warnings on injected call 
Fixes: #18202
 2018-07-24 13:14:10 -04:00
Brad King 08eb157c03 Tests: Add case showing CMP0048 warning on injected project command 
Issue: #18202
 2018-07-24 13:14:09 -04:00
Rolf Eike Beer 7aa26cf0e9 FindPkgConfig: allow to create global imported targets 2018-07-22 13:33:04 +02: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 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
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