reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-24 05:53:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
40,448 Commits 4 Branches 185 Tags
Commit Graph

40448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vitaly Stakhovsky
65ab9ce938 Genex: Return Evaluate results as const std::string& 
Also remove unused overloads.
 2018-08-28 13:56:29 -04:00
Brad King
ca7507cebc Merge topic 'FindMatlab-missing-install' 
7d9640dbc2 FindMatlab: Guard against nonexistent installation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2318
 2018-08-28 13:52:17 -04:00
Brad King
9da844d8cb Merge topic 'lg-directory' 
50fbfee3a0 cmLocalGenerator: return directories as const std::string&

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2309
 2018-08-28 13:43:48 -04:00
Brad King
6f7c96fb17 Merge topic 'mk-directory' 
c8fd23ec6f cmMakefile: return directories as const std::string&

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2311
 2018-08-28 13:42:43 -04:00
Chuck Atkins
2bd71f6377 FindLua: Remove manually specified additional paths 
The additional paths specified are already accounted for in the appropriate
Platform files.
 2018-08-28 13:27:35 -04:00
Brad King
0e764082fe Merge branch 'android-ndk-r18' into release-3.12 
Merge-request: !2319
 2018-08-28 09:44:03 -04:00
Brad King
ca97d4cb5f Android: Add support for NDK r18 
NDK r18 drops GCC toolchains and some STL types.  We need to choose a
clang toolchain by default when no gcc toolchains are available.  Switch
the STL type default to `c++_static` when the old `gnustl_static`
default is not available.

Update the test suite to not run tests for STL types that do not exist.
Also do not expect the gcc toolchain `cpp` tool to be available because
r18 does not provide it.  Also teach it to tolerate `gcc -dumpmachine`
output like `arm--linux-android` that differs from the toolchain prefix.

Fixes: #18301
 2018-08-28 09:27:26 -04:00
Kitware Robot
c549deed7f CMake Nightly Date Stamp 2018-08-28 00:01:10 -04:00
Vitaly Stakhovsky
50fbfee3a0 cmLocalGenerator: return directories as const std::string& 2018-08-27 15:48:57 -04:00
Chuck Atkins
7d9640dbc2 FindMatlab: Guard against nonexistent installation 2018-08-27 14:57:17 -04:00
Vitaly Stakhovsky
c8fd23ec6f cmMakefile: return directories as const std::string& 2018-08-27 14:07:43 -04:00
Brad King
826e75814b Merge topic 'cray_cce_cxx14' 
5a655681c3 Cray: Record C++14 compiler mode options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2307
 2018-08-27 14:06:24 -04:00
Brad King
4431bb0516 Merge topic 'more-misc-typos' 
aca65a9379 Maint: misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2301
 2018-08-27 14:05:44 -04:00
Brad King
2cd6ec6fe4 Merge topic 'update-icons' 
66f59bd7da cmake-gui: Update icons

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2295
 2018-08-27 14:05:12 -04:00
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
4a1b18db55 Merge topic 'FindZLIB-ProgramFiles' 
fbbc6e2eef FindZLIB: Fix path detection via ProgramFiles env variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: RElesgoe <relesgoe@gmail.com>
Merge-request: !2287
 2018-08-27 14:02:51 -04:00
Brad King
07556f1567 Merge topic 'doc-include_directories-alternative' 
e558ada977 Help: Document alternative to include_directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2304
 2018-08-27 14:01:57 -04:00
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
Kelly (KT) Thompson
5a655681c3 Cray: Record C++14 compiler mode options 
Fixes: #18270
 2018-08-24 15:15:53 -04:00
luz.paz
aca65a9379 Maint: misc. typos 
Found via `codespell`.
 2018-08-24 14:58:49 -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
Andreas Schneider
fbbc6e2eef FindZLIB: Fix path detection via ProgramFiles env variables 2018-08-24 07:24:00 +02:00
Kitware Robot
e33c6c357b CMake Nightly Date Stamp 2018-08-24 00:01:22 -04:00
David Demelier
e558ada977 Help: Document alternative to include_directories 
Many existing tutorials suggest `include_directories` but that does
not handle propagation to dependencies and such.  Add a link to its
documentation suggesting `target_include_directories` instead.
 2018-08-23 16:00:02 -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