mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 14:48:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
40,378 Commits 2 Branches 401 Tags
4a1b18db55935ab0a1a960fcea51247f1c5b4551
Commit Graph

24968 Commits

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 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
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 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 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
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
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 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 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
Vitaly Stakhovsky 16e17376c7 EvaluateExpression() returns std::string 2018-08-16 08:09:42 -04:00
Kitware Robot ba122ad2a4 CMake Nightly Date Stamp 2018-08-16 00:01:12 -04: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 ca2e781703 Merge topic 'vsoptions-parse' 
6ce56028d5 cmVisualStudioGeneratorOptions::Parse(): const std::string& argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2289
 2018-08-15 07:50:46 -04:00
Kitware Robot e2924acef9 CMake Nightly Date Stamp 2018-08-15 00:01:05 -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
Kitware Robot bc0b976776 CMake Nightly Date Stamp 2018-08-14 00:01:08 -04:00
Vitaly Stakhovsky 6ce56028d5 cmVisualStudioGeneratorOptions::Parse(): const std::string& argument 2018-08-13 18:22:11 -04:00
Craig Scott 505a713a04 Merge topic 'evaluate-stdstring' 
c530e2f74f cmCompiledGeneratorExpression::Evaluate(): return const std::string&

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2279
 2018-08-13 17:14:27 -04:00
Craig Scott 0eb4b0bb7b Merge topic 'state-directory-stdstring' 
ada121e573 cmStateDirectory: use const std::string& for return values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2277
 2018-08-13 17:12:37 -04:00
Sebastian Holtermann 3aa11f31fc Autogen: Use integers to store the Qt version 2018-08-13 18:12:47 +02:00
Sebastian Holtermann 1d87c9f318 Autogen: Initializer: Group variables in structs 2018-08-13 11:31:39 +02:00
Kitware Robot cd8b094d1d CMake Nightly Date Stamp 2018-08-13 00:01:05 -04:00
Bastien Schatt e4ba1f5a94 VS: Disallow ReferenceOutputAssembly in ProjectReference if not possible 
Explicitly turn off `ReferenceOutputAssembly` in `ProjectReference`
elements naming other project files whose types do not produce
assemblies.  We already do this for `C#` but it makes sense for other
languages too.

Fixes: #17906
 2018-08-12 16:06:56 +02:00
Vitaly Stakhovsky ada121e573 cmStateDirectory: use const std::string& for return values 2018-08-12 18:59:21 +10:00
Kitware Robot 0f17dc51c2 CMake Nightly Date Stamp 2018-08-12 00:01:07 -04:00
Kitware Robot da3dc2f0cf CMake Nightly Date Stamp 2018-08-11 00:01:19 -04:00
Brad King eba2b13a83 Merge topic 'msvc-link-non-english' 
7e359823c9 MSVC: Preserve linker output encoding
b7e7718a38 MSVC: Fix manifest resource encoding

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2261
 2018-08-10 11:01:11 -04:00
Kitware Robot 292542d207 CMake Nightly Date Stamp 2018-08-10 00:01:11 -04:00
Vitaly Stakhovsky c530e2f74f cmCompiledGeneratorExpression::Evaluate(): return const std::string& 2018-08-09 14:50:17 -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
Shane Parris 6f3b9e8b95 cmState: Clear GlobVerificationManager state on Reset 
It should not persist across multiple configure rounds.

Fixes: #18208
 2018-08-09 13:03:50 -04:00
Justin Goshi 7e359823c9 MSVC: Preserve linker output encoding 
When using the Ninja or Makefile generator with MSVC on Windows
we invoke the linker through a `cmake -E vs_link_{exe,dll}` wrapper.
Preserve the linker output encoding to match `link.exe` behavior
instead of forcing UTF-8.
 2018-08-09 11:06:12 -04:00
Justin Goshi b7e7718a38 MSVC: Fix manifest resource encoding 
When using the Ninja or Makefile generator with MSVC on Windows
we invoke the resource compiler (`rc.exe`) to compile a manifest
resource.  CMake generates the file with UTF-8 encoding so we
need to add a pragma to inform the resource compiler.
 2018-08-09 11:03:10 -04:00
Brad King c4ab098097 CMake 3.12.1 2018-08-09 08:06:18 -04:00
Brad King 75844dd609 Merge topic 'cleanup-find-cstr' 
69ca85cc7f Remove unnecessary c_str() in RegularExpression::find calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2271
 2018-08-09 08:00:03 -04:00
Brad King 34334c098f Merge topic 'cmGeneratedFileStream_string' 
b6802cd506 cmGeneratedFileStream: clang-tidy applied to remove redundant ``c_str`` calls
a688defcc6 cmGeneratedFileStream: Use ``std::string const&`` instead of ``const char*``

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2266
 2018-08-09 07:59:23 -04:00
Brad King 575f06e48c Merge topic 'update-kwsys' 
ba872ea9c3 Merge branch 'upstream-KWSys' into update-kwsys
4d76239a51 KWSys 2018-08-07 (9044518f)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2268
 2018-08-09 07:53:49 -04:00