mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-12 17:19:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
40,374 Commits 2 Branches 401 Tags
fa2ecf7fceacc135df5c898d70eeafdcc21afb19
Commit Graph

40374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King fa2ecf7fce Merge topic 'ProjectReference' 
e4ba1f5a94 VS: Disallow ReferenceOutputAssembly in ProjectReference if not possible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2285
 2018-08-27 14:01:01 -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 92de93b974 Merge topic 'xcode-compiler-id-sign-identity' 
c68b358ce3 Xcode: Set CODE_SIGN_IDENTITY during compiler identification

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Gregor Jasny <gjasny@googlemail.com>
Merge-request: !2299
 2018-08-27 13:54:44 -04:00
Brad King 74b9538c26 Merge topic 'extra-gen-fix-0' 
e4e6b63ec9 Extra Generator: Fix extraction of macros with value 0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2308
 2018-08-27 13:53:28 -04:00
Brad King 9e3aee952d Merge topic 'vs2017-no-default-FC' 
1bd768174a VS: Avoid VS 2017 toolset default use of /FC flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alberto Garcia Illera <agarciaillera@gmail.com>
Acked-by: Martin Hořeňovský <martin.horenovsky@gmail.com>
Merge-request: !2306
 2018-08-27 13:52:02 -04:00
Kitware Robot 363fffc736 CMake Nightly Date Stamp 2018-08-27 00:01:05 -04:00
Kitware Robot a175ade62d CMake Nightly Date Stamp 2018-08-26 00:01:06 -04:00
Kitware Robot 0b26ab15c4 CMake Nightly Date Stamp 2018-08-25 00:01:18 -04:00
Rafal Parzych c68b358ce3 Xcode: Set CODE_SIGN_IDENTITY during compiler identification 
If `CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY` is set then propagate
it to the compiler id test project too.

Fixes: #18292
 2018-08-24 13:58:51 -04:00
ibisz e4e6b63ec9 Extra Generator: Fix extraction of macros with value 0 
Fix logic in CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs
to handle macros with value `0`.
 2018-08-24 13:51:30 -04:00
Brad King 0897c3cf58 Merge branch 'release-3.12' 2018-08-24 13:40:26 -04:00
Brad King 3c1f76b1c4 Merge topic 'doc-clang-tidy-typo' 
85432f4898 Help: Fix typo in clang-tidy example -checks option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2303
 2018-08-24 13:39:42 -04:00
Brad King fef24e72a9 Merge branch 'doc-clang-tidy-typo' into release-3.12 
Merge-request: !2303
 2018-08-24 13:39:06 -04:00
David Demelier 85432f4898 Help: Fix typo in clang-tidy example -checks option 2018-08-24 13:37:24 -04:00
Brad King e90670925f Merge topic 'FindCUDA-deprecate-cublas_device' 
bdf1f36135 FindCUDA: Do not find cublas_device on CUDA >= 9.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2298
 2018-08-24 13:35:36 -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
Brad King 7b148e7a30 Merge topic 'state-reset-glob' 
6f3b9e8b95 cmState: Clear GlobVerificationManager state on Reset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2278
 2018-08-24 13:34:06 -04:00
Brad King 6a8b65c042 Merge topic 'ctest-submit-httpauth' 
5029d58c38 ctest: allow cdash submissions using alternate authentication methods

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2288
 2018-08-24 13:32:13 -04:00
Kitware Robot e33c6c357b CMake Nightly Date Stamp 2018-08-24 00:01:22 -04:00
Brad King d515112906 Merge branch 'FindCUDA-deprecate-cublas_device' into release-3.12 
Merge-request: !2298
 2018-08-23 14:51:47 -04:00
Brad King a173118f8c Merge branch 'cuda-no-cublas_device' into release-3.12 
Merge-request: !2296
 2018-08-23 14:51:33 -04:00
Kenta Kubo bdf1f36135 FindCUDA: Do not find cublas_device on CUDA >= 9.2 
The `cublas_device` has been deprecated and will be removed in
future versions of CUDA.

Issue: #18290
 2018-08-23 14:49:46 -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
Brad King b2798594a5 Merge topic 'autogen_variables_in_structs' 
3aa11f31fc Autogen: Use integers to store the Qt version
1d87c9f318 Autogen: Initializer: Group variables in structs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2286
 2018-08-23 14:28:49 -04:00
Brad King 8a3cba5257 Merge branch 'state-reset-glob' into release-3.12 
Merge-request: !2278
 2018-08-23 14:17:31 -04:00
Brad King 1bd768174a VS: Avoid VS 2017 toolset default use of /FC flag 
VS 2017 toolsets now use this flag by default if `UseFullPaths` is
not explicitly set to `false` in the .vcxproj file.  Since there is
no negative form of this flag there is no way for projects to turn
it off through our flag map.  Also, the Makefile and Ninja generators
do not add this flag unless it is explicitly specified by the project.

Teach our generator to set `UseFullPaths` to `false` in VS 2017
unless the project or use has explicitly specified `/FC`.

Fixes: #18261
 2018-08-23 14:05:00 -04:00
Craig Scott 91c9a52273 Merge topic 'tweak_unset_docs' 
1a0f1a25a4 Help: Clarify the unset command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2300
 2018-08-23 07:53:19 -04:00
Kitware Robot 9e68a4279b CMake Nightly Date Stamp 2018-08-23 00:01:10 -04:00
Kitware Robot 8901b9fe89 CMake Nightly Date Stamp 2018-08-22 00:01:06 -04:00
Robert Maynard 1a0f1a25a4 Help: Clarify the unset command 2018-08-21 14:16:32 -04:00
Kitware Robot b8dd624ebe CMake Nightly Date Stamp 2018-08-21 00:01:06 -04:00
Kitware Robot ac5ceee902 CMake Nightly Date Stamp 2018-08-20 00:01:07 -04:00
Kitware Robot ca97f492d8 CMake Nightly Date Stamp 2018-08-19 00:01:05 -04:00
Kitware Robot b82de2ab45 CMake Nightly Date Stamp 2018-08-18 00:01:25 -04:00
Craig Scott ffea7a479c Merge branch 'release-3.12' 2018-08-18 10:56:13 +10:00
Craig Scott 7e919ace31 Merge branch 'export-properties-undefined' into release-3.12 
Merge-request: !2294
 2018-08-18 10:54:47 +10: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 43027ce56d Merge topic 'link-options' 
174721ecc0 LINK_OPTIONS property: add test for static library.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2284
 2018-08-17 20:25:15 -04:00
Craig Scott 786af7a711 Merge topic 'evaluate-stdstring' 
16e17376c7 EvaluateExpression() returns std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2293
 2018-08-17 19:06:37 -04:00
Clinton Stimpson 5029d58c38 ctest: allow cdash submissions using alternate authentication methods 2018-08-17 09:18:07 -06:00
Kitware Robot 39cfdd6556 CMake Nightly Date Stamp 2018-08-17 00:01:10 -04:00
Craig Scott dbd3e2c53d EXPORT_PROPERTIES: Prevent null dereference for undefined property 
Fixes: #18260
 2018-08-16 22:22:13 +10: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
Vitaly Stakhovsky 16e17376c7 EvaluateExpression() returns std::string 2018-08-16 08:09:42 -04:00
Craig Scott 556ad468f5 Merge topic 'doc-cdash-upload-return-value' 
a0916a4692 Help: Add RETURN_VALUE as an option to ctest_submit(CDASH_UPLOAD

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2291
 2018-08-16 07:08:42 -04:00
Kitware Robot ba122ad2a4 CMake Nightly Date Stamp 2018-08-16 00:01:12 -04:00
Betsy McPhail a0916a4692 Help: Add RETURN_VALUE as an option to ctest_submit(CDASH_UPLOAD 2018-08-15 16:29:53 -04: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