Commit Graph

27755 Commits

Author SHA1 Message Date
Brad King 6f15cea15e Merge topic 'autogen_windows_search_fix'
90d643c312 Autogen: Fix ambiguity in header file detection on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3962
2019-10-31 09:09:39 -04:00
Brad King 9a72065fa9 Merge topic 'update-kwsys'
5ddcaae77c Merge branch 'upstream-KWSys' into update-kwsys
fe6725a1f7 KWSys 2019-10-30 (43131a7c)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3963
2019-10-31 08:54:45 -04:00
Kitware Robot e4a5215e97 CMake Nightly Date Stamp 2019-10-31 00:01:10 -04:00
Sebastian Holtermann 90d643c312 Autogen: Fix ambiguity in header file detection on Windows
On Windows, `CollapseFullPath` called with a path that ends with a dot
might return a file with the same base name but any extension.
To make sure we get only the file with the requested header extension,
pass the complete file name to `CollapseFullPath`.

Fixes: #19892
2019-10-30 09:34:06 -04:00
Brad King dbf5ae35b5 Merge topic 'scanbuild-fixes'
fe5ba71bd0 Tests: Suppress clang scan-build warning in UTF8 test
3cf71e8c7d cmLocalGenerator: Drop unused initializer in AddUnityBuild

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3958
2019-10-30 09:30:34 -04:00
Brad King 5ddcaae77c Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2019-10-30 (43131a7c)
2019-10-30 09:17:30 -04:00
Kitware Robot 5b64788c51 CMake Nightly Date Stamp 2019-10-30 00:01:07 -04:00
Brad King 1fb4839225 Merge topic 'ccmake_progress_bar_and_log_display'
2086da1713 ccmake: Add output and progress bar release note
66d969fcc4 ccmake: Don't overwrite the last character of the title
1d0e557aed ccmake: Display output during configure and generate
c168e789df ccmake: Use the error display for all the logs
3300070cc2 ccmake: Display an ASCII progress bar in the status bar

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3942
2019-10-29 11:18:16 -04:00
Kitware Robot cffff0f17e CMake Nightly Date Stamp 2019-10-29 00:01:08 -04:00
Brad King 3cf71e8c7d cmLocalGenerator: Drop unused initializer in AddUnityBuild
Fix a warning from clang-scanbuild:

    warning: Value stored to 'chunk' during its initialization is never read
    for (size_t itemsLeft = filtered_sources.size(), chunk = batchSize,
                                                     ^~~~~   ~~~~~~~~~

Simply remove the initializer.
2019-10-28 15:52:55 -04:00
Craig Scott cdcc173e23 Merge topic 'project-version-buffer-overflow'
82cdb26c93 project: Fix potential buffer write-past-end for version components
15a0b0d046 Help: math() expressions must be representable as signed 64-bit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3948
2019-10-28 06:50:22 -04:00
Kitware Robot 0e4190ba9e CMake Nightly Date Stamp 2019-10-28 00:01:05 -04:00
Kitware Robot f3968470ce CMake Nightly Date Stamp 2019-10-27 00:01:04 -04:00
Craig Scott 82cdb26c93 project: Fix potential buffer write-past-end for version components
This fixes two errors: not accounting for the trailing null and a
misunderstanding of what std::numeric_limits::digits10 means.
2019-10-26 17:50:24 +11:00
Kitware Robot a894397153 CMake Nightly Date Stamp 2019-10-26 00:01:09 -04:00
Brad King 5c8d821eca Merge topic 'xcode-scheme-env'
f0005dacde Xcode: Add CMAKE_XCODE_SCHEME_ENVIRONMENT variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3933
2019-10-25 09:37:49 -04:00
Sylvain Joubert 66d969fcc4 ccmake: Don't overwrite the last character of the title 2019-10-25 14:58:23 +02:00
Sylvain Joubert 1d0e557aed ccmake: Display output during configure and generate 2019-10-25 14:58:23 +02:00
Sylvain Joubert c168e789df ccmake: Use the error display for all the logs 2019-10-25 14:58:23 +02:00
Sylvain Joubert 3300070cc2 ccmake: Display an ASCII progress bar in the status bar
The status bar is now only used to display the progress.
The status log are not shown anymore since for the most cases they went
by too quickly to be read. As for cases when a process is long enough
to display and read a log, it would probably be a previous unrelated
message.
2019-10-25 14:58:23 +02:00
Kitware Robot 5a3f539cd5 CMake Nightly Date Stamp 2019-10-25 00:01:07 -04:00
Felix Heidrich f0005dacde Xcode: Add CMAKE_XCODE_SCHEME_ENVIRONMENT variable
Initialize the `XCODE_SCHEME_ENVIRONMENT` target property.

This was left out of commit 6b7f1e1db0 (Xcode: Add variables and
properties to configure schemes, 2018-07-29, v3.13.0-rc1~243^2).
2019-10-24 11:24:34 -04:00
Brad King 26a0f5d6d4 Merge topic 'fortran-ext-F'
39fbbd6fea Fortran: Add .F extension to Source Files group

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3940
2019-10-24 08:02:21 -04:00
Kitware Robot 490da0bd33 CMake Nightly Date Stamp 2019-10-24 00:01:04 -04:00
Johnny Jazeix 39fbbd6fea Fortran: Add .F extension to Source Files group
While at it, improve source layout of the regex string literal.

Fixes: #8768
2019-10-23 09:20:25 -04:00
Kitware Robot 44b5f037e6 CMake Nightly Date Stamp 2019-10-23 00:01:08 -04:00
Brad King 04e0fa3307 Merge topic 'android-native'
c5892e484e Android: add support for native compilation, such as with the Termux app

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3917
2019-10-22 08:57:44 -04:00
Kitware Robot 24703b11b4 CMake Nightly Date Stamp 2019-10-22 00:01:07 -04:00
Brad King 0bf7a93f91 Merge topic 'ccmake-clear-help'
9276beae5e ccmake: Fully clear the 1st help line when processing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3937
2019-10-21 11:29:12 -04:00
Brad King 667f2861dc Merge topic 'project-include-before'
f7acc1266c project: Add variable CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE_BEFORE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3936
2019-10-21 11:24:28 -04:00
Brad King 50afd147f8 Merge topic 'vs-per-config-sources'
55a0bebdd3 VS: Add support for per-config sources
bcaecf6bcd Teach check for single-language targets to consider all configurations
324988a6b1 cmGeneratorTarget: Add GetAllConfigCompileLanguages method
fd2c9fac10 cmGeneratorTarget: Return non-const sources from GetAllConfigSources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3882
2019-10-21 11:12:06 -04:00
Kitware Robot a82a96f35b CMake Nightly Date Stamp 2019-10-21 00:01:05 -04:00
Sylvain Joubert 9276beae5e ccmake: Fully clear the 1st help line when processing 2019-10-20 14:25:05 +02:00
Kitware Robot 41854d608b CMake Nightly Date Stamp 2019-10-20 00:01:04 -04:00
Kitware Robot 0671f71d70 CMake Nightly Date Stamp 2019-10-19 00:01:07 -04:00
Deniz Bahadir f7acc1266c project: Add variable CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE_BEFORE
Follow up commit 0761186949 (project: Add variable
CMAKE_PROJECT_INCLUDE_BEFORE, 2019-03-28, v3.15.0-rc1~294^2) with a
project-specific variant.  This variable will be used similar to the
already existing `CMAKE_PROJECT_INCLUDE_BEFORE` and
`CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE` variables.

Fixes: #19854
2019-10-18 14:44:24 -04:00
Brad King 92780281c2 CMake 3.16.0-rc2 2019-10-18 09:23:00 -04:00
Brad King fdb41a5102 Merge topic 'variable_watch-modernize'
4bedf6c9fa Refactor: Modernize `cmVariableWatchCommand` a little

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3892
2019-10-18 09:02:29 -04:00
Brad King b34b4c5eac Merge topic 'vs-vctargetspath'
e7d57bc3c3 VS: Propagate CMAKE_VS_GLOBALS into custom targets
45b4b4b930 VS: Propagate CMAKE_VS_GLOBALS into compiler id projects
548e9051a4 VS: Add support to override VCTargetsPath through toolset
99e83d4235 cmake: Teach --build mode to load CMAKE_GENERATOR_TOOLSET

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3817
2019-10-18 09:01:48 -04:00
Brad King 1c84b5c86f Merge topic 'pch-makefile-depends'
797689ab35 PCH: Fix Makefile dependencies to rebuild PCH on header changes
0b10b3ed6b cmMakefileTargetGenerator: Inline WriteObjectBuildFile in only call site

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3928
2019-10-18 08:57:16 -04:00
Kitware Robot 154aa87ca6 CMake Nightly Date Stamp 2019-10-18 00:01:07 -04:00
Brad King 55a0bebdd3 VS: Add support for per-config sources
Since commit 97cc29c766 (VS: Teach generators how to mark per-config
source files, 2017-04-10, v3.9.0-rc1~268^2~2) the VS generators have
known how to generate per-config sources.  We've now converted most
other code paths to support per-config sources, so drop the check
that disallows it.

This leaves only per-config support for precompiled headers and unity
build transformations, but those are optional features that can be
addressed later.

Fixes: #18233
Issue: #19789
2019-10-17 14:05:39 -04:00
Brad King bcaecf6bcd Teach check for single-language targets to consider all configurations 2019-10-17 14:03:54 -04:00
Brad King 324988a6b1 cmGeneratorTarget: Add GetAllConfigCompileLanguages method
Return all languages needed to compile sources in the target in
any configuration.
2019-10-17 14:03:54 -04:00
Brad King fd2c9fac10 cmGeneratorTarget: Return non-const sources from GetAllConfigSources
We need a non-const pointer to `cmSourceFile` instances in order to
call `GetOrDetermineLanguage` on them.
2019-10-17 14:03:54 -04:00
Brad King 5417737fac Merge topic 'graphviz'
553658393c Graphviz: added test suite, fixes, enhancements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: slodki <slodki_dom@poczta.onet.pl>
Merge-request: !3766
2019-10-17 13:54:26 -04:00
Brad King ea048ed66c Merge topic 'export-target-lang-name'
0e436c573c install,export: Do not treat language names as target names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3927
2019-10-17 13:52:00 -04:00
Brad King b903092b31 Merge topic 'vs_dotnet_documentation_file'
89ff3ee779 VS: Add VS_DOTNET_DOCUMENTATION_FILE property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3879
2019-10-17 13:51:11 -04:00
Brad King 6dedb97420 Merge branch 'pch-makefile-depends' into release-3.16
Merge-request: !3928
2019-10-17 10:41:43 -04:00
Brad King 797689ab35 PCH: Fix Makefile dependencies to rebuild PCH on header changes
Teach the Makefile generator to scan the implicit dependencies of PCH
creation.  When a header named by `target_precompile_headers` changes
the corresponding PCH must be rebuilt and all consumers recompiled.

Fixes: #19830
2019-10-17 10:29:31 -04:00