Commit Graph

24991 Commits

Author SHA1 Message Date
Vitaly Stakhovsky 4e94f6447a cmGlobalGenerator::AddInstallComponent(): Accept std::string argument 2018-08-30 11:52:45 -04:00
Brad King 5563d6b3a6 Merge topic 'minor-cleanup'
fb73edf70c cmake: Drop unnecessary working mode checks
bd7dd6d414 cmake: Declare VariableWatch member only when used

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2326
2018-08-30 09:25:51 -04:00
Brad King b11e021bed Merge topic 'cpack-ext-stage-and-run'
4a0f664aaf CPackExt: Add CPACK_EXT_ENABLE_STAGING and CPACK_EXT_PACKAGE_SCRIPT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2272
2018-08-30 09:24:31 -04:00
Brad King 69aaf9b63b Merge topic 'cstr-remove'
95084a313d cmVisualStudio10TargetGenerator: clean up c_str()s

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2322
2018-08-30 09:19:40 -04:00
Brad King d879999534 Merge topic 'genex-evaluate-stdstring'
65ab9ce938 Genex: Return Evaluate results as const std::string&

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2314
2018-08-30 09:18:58 -04:00
Kitware Robot e04a023eab CMake Nightly Date Stamp 2018-08-30 00:01:09 -04:00
Brad King fb73edf70c cmake: Drop unnecessary working mode checks
In `cmake::Run` we return before `Configure` or `Generate` when
not working in normal mode so they do not need mode checks.

While at it, remove a long-outdated comment about when to save the
cache.
2018-08-29 09:38:32 -04:00
Brad King bd7dd6d414 cmake: Declare VariableWatch member only when used 2018-08-29 09:38:32 -04:00
Kitware Robot 6783fac20a CMake Nightly Date Stamp 2018-08-29 00:01:12 -04:00
Vitaly Stakhovsky 95084a313d cmVisualStudio10TargetGenerator: clean up c_str()s 2018-08-28 14:41:19 -04:00
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 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
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
Vitaly Stakhovsky c8fd23ec6f cmMakefile: return directories as const std::string& 2018-08-27 14:07:43 -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 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
luz.paz aca65a9379 Maint: misc. typos
Found via `codespell`.
2018-08-24 14:58:49 -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
T.J. Corona 66f59bd7da cmake-gui: Update icons 2018-08-16 11:56:08 -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
Marc Chevrier 974de0e199 static library: add property STATIC_LIBRARY_OPTIONS
issue: #18251
2018-08-15 15:20:18 +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 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