Commit Graph

27917 Commits

Author SHA1 Message Date
Daniel Eiband
4e37508c85 cmLocalGenerator: Refactor to use cmMakeSingleCommandLine 2019-11-24 20:13:23 +01:00
Daniel Eiband
96e5042e46 cmCustomCommand: Explicitly pass backtrace on construction 2019-11-24 20:13:23 +01:00
Daniel Eiband
3dc084ebc1 cmMakefile: Explicitly pass backtrace to GetCustomCommandTarget
Allow GetCustomCommandTarget to be called at generate time with correct
backtraces.
2019-11-24 20:13:23 +01:00
Daniel Eiband
e8360afbf7 cmPluginAPI: Correct typo in documentation of FinalPass 2019-11-24 20:13:23 +01:00
Daniel Eiband
bf76a6b801 cmMakefile: Delay CheckTargetProperties and FinalPass to generate time 2019-11-24 20:13:23 +01:00
Kitware Robot
adc50529ac CMake Nightly Date Stamp 2019-11-24 00:01:07 -05:00
Kitware Robot
d8571ccb9c CMake Nightly Date Stamp 2019-11-23 00:01:10 -05:00
Kitware Robot
07226324eb CMake Nightly Date Stamp 2019-11-22 00:01:10 -05:00
Brad King
51d83d4955 Merge topic 'xcode-objc'
1e68fb0c91 Xcode: Set source file type for Objective C/C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4073
2019-11-21 11:27:25 -05:00
Brad King
ad815939c9 Merge topic 'ccmake_fix_help_text_crash'
b4ef7fbaa8 ccmake: Fix crash with cache entries almost the size of the window

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4062
2019-11-21 11:10:34 -05:00
Brad King
ae7d99fbd5 Merge topic 'load_cache_in_script'
5e9ecaae0e load_cache: Allow READ_WITH_PREFIX mode in cmake scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4042
2019-11-21 11:03:09 -05:00
Brad King
d9cf0ec4d4 Merge topic 'fileapi-multi-config'
51c69fe5f8 FileAPI: Add "multiConfig" parameter to index file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !4072
2019-11-21 11:02:00 -05:00
Kitware Robot
0fff8d653c CMake Nightly Date Stamp 2019-11-21 00:01:07 -05:00
Kyle Edwards
51c69fe5f8 FileAPI: Add "multiConfig" parameter to index file 2019-11-20 09:46:10 -05:00
Brad King
1e68fb0c91 Xcode: Set source file type for Objective C/C++
Fixes: #19998
2019-11-20 09:43:00 -05:00
Kitware Robot
5f630a934a CMake Nightly Date Stamp 2019-11-20 00:01:10 -05:00
Craig Scott
9e9787f19a Merge topic 'ctest-repeat'
32c165d263 CTest: Consolidate '--repeat-* n' options as `--repeat *:n`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4053
2019-11-19 15:48:38 -05:00
Charles Barto
5e9ecaae0e load_cache: Allow READ_WITH_PREFIX mode in cmake scripts 2019-11-19 14:39:00 -05:00
Sylvain Joubert
b4ef7fbaa8 ccmake: Fix crash with cache entries almost the size of the window
The previous code:

if (curFieldLen < width) {
  ...
  strncpy(bar + curFieldLen + 2, help, width - curFieldLen - 2);

was not correctly guarded against cache entries whose size were exactly
1 or 2 characters short of the window size.
"if (curFieldLen - 2 < width)" would have prevented a copy of
negative/max_int characters and a subsequent crash.

The whole method was modernized with std::string instead of char*
2019-11-19 20:06:31 +01:00
Brad King
3520208cbd Merge topic 'ccmake_render_main_form_on_resize'
ce99f5ee69 ccmake: Fix rendering on window resize

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4061
2019-11-19 11:37:27 -05:00
Brad King
a1d0653fc8 Merge topic 'xcode-scheme-workdir'
92c4c852db Xcode: Add custom working directory property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4063
2019-11-19 11:31:16 -05:00
Brad King
aa6437e3e0 Merge topic 'codelite_make_j_0'
7d6639bf8d CodeLite: Do not pass -j argument with CPU count 0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4067
2019-11-19 11:30:20 -05:00
Brad King
ba773cfec8 Merge topic 'modernize-memory-management'
7e86f71eff cmOutputRequiredFilesCommand: Modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4055
2019-11-19 11:29:26 -05:00
Brad King
fb7f8e5fbd Merge topic 'FindFLEX-work-dir'
c5fb36a4cb FindFLEX: Add policy CMP0098 to run flex in build tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3981
2019-11-19 11:27:15 -05:00
Kitware Robot
843936f51b CMake Nightly Date Stamp 2019-11-19 00:01:12 -05:00
Gregor Jasny
92c4c852db Xcode: Add custom working directory property
Closes: #19967
2019-11-18 22:34:34 +01:00
Johnny Jazeix
7d6639bf8d CodeLite: Do not pass -j argument with CPU count 0
Fixes: #15054, #16727
2019-11-18 22:10:57 +01:00
Brad King
d25d75687d CMake 3.16.0-rc4 2019-11-18 13:44:31 -05:00
Sylvain Joubert
ce99f5ee69 ccmake: Fix rendering on window resize
Repro steps: configure (without errors), the logs are displayed then the
cache is displayed again, resize the window up -> the logs are
redisplayed after resize instead of the cache

The 'CurrentForm' pointer were left pointed to the last log message
form, this resets it to the main form when configure or generate is done
2019-11-18 17:05:37 +01:00
Brad King
776d1e5e79 Merge topic 'win-no-error-popup'
a4c19cb895 Windows: Restore suppression of error report popups in CI builds
0b9f1cc96b Merge branch 'upstream-KWSys' into win-no-error-popup
9e27e52d4b KWSys 2019-11-15 (329d8c7c)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4052
2019-11-18 09:52:13 -05:00
Brad King
1c09b8c164 Merge topic 'cpack-custom-templates' into release-3.16
7d6ab5dc5b CPack: Restore support for custom package configuration templates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4054
2019-11-18 09:50:57 -05:00
Brad King
0e46dea343 Merge topic 'cpack-custom-templates'
7d6ab5dc5b CPack: Restore support for custom package configuration templates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4054
2019-11-18 09:50:57 -05:00
Brad King
6cb9867ba3 Merge topic 'pch-reuse-no-prop' into release-3.16
bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4046
2019-11-18 09:46:26 -05:00
Brad King
e14c9af013 Merge topic 'pch-reuse-no-prop'
bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4046
2019-11-18 09:46:26 -05:00
Craig Scott
1bd06579a3 Merge topic 'ccmake_redirect_stdstreams'
88cfef0821 ccmake: redirect stdout/stderr to the displayed logs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4005
2019-11-18 05:46:31 -05:00
Kitware Robot
e56e9c14c5 CMake Nightly Date Stamp 2019-11-18 00:01:09 -05:00
Kitware Robot
cf598311ce CMake Nightly Date Stamp 2019-11-17 00:01:06 -05:00
Sylvain Joubert
88cfef0821 ccmake: redirect stdout/stderr to the displayed logs
Use cmSystemTools to report some messages.
These should now be caught and displayed properly,
both in ccmake and cmake-gui

Avoid log display flickering during processing
- Don't clear the screen each time the long message form is rendered.
  It always renders the whole screen again so clearing it only causes
  flickering.
- Add scroll down capabilities to the long message form so that it can
  draw itself directly in the correct state. This removes the need to
  programatically scroll down just after that also caused flickering.

Fixes #19882
Fixes #13288
2019-11-16 08:27:32 +01:00
Kitware Robot
de1d530ef0 CMake Nightly Date Stamp 2019-11-16 00:01:09 -05:00
Marc Chevrier
7e86f71eff cmOutputRequiredFilesCommand: Modernize memory management
Also use std::string over char* when possible.
2019-11-15 19:40:48 +01:00
Jannick
c5fb36a4cb FindFLEX: Add policy CMP0098 to run flex in build tree 2019-11-15 11:46:06 -05:00
Brad King
7d6ab5dc5b CPack: Restore support for custom package configuration templates
Refactoring in commit 98617f1be0 (Refactor: Move CPack internal files to
`Internal/CPack/` directory, 2019-07-09, v3.16.0-rc1~449^2) accidentally
changed the public-facing names of the templates.  The name passed to
`FindTemplate` is searched in `CMAKE_MODULE_PATH` and should not change.
Remove the `Internal/CPack/` prefix on the names added by that commit.
Teach `FindTemplate` to use our builtin default directly when the
public-facing name is not found in `CMAKE_MODULE_PATH`.

Fixes: #19979
2019-11-15 10:38:08 -05:00
Brad King
32c165d263 CTest: Consolidate '--repeat-* n' options as --repeat *:n
Combine `--repeat-until-fail`, `--repeat-until-pass`, and
`--repeat-after-timeout` to create a single `--repeat <mode>:<n>`
option.  Retain `--repeat-until-fail` too because that has been
available in previous releases.
2019-11-15 10:08:33 -05:00
Kyle Edwards
5695b0464b Merge topic 'cmake-e-rm'
2d0100fac7 replace remove and remove_directory with rm in tests
5239fc5c75 cmake -E: Add rm with improved semantics over remove and remove_directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3949
2019-11-15 09:57:56 -05:00
Cristian Adam
bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call
Fixes: #19970
2019-11-15 09:47:56 -05:00
Brad King
a4c19cb895 Windows: Restore suppression of error report popups in CI builds
On Windows, libuv uses `_CrtSetReportHook` to install a handler it uses
to suppress assertions on invalid file descriptors in `_get_osfhandle`.
This removes the handler we install in CI environments to suppress
interactive popups.  Move installation of our handler to after libuv is
initialized so that our handler is actually used.

Unfortunately this also removes libuv's handler and so may cause Debug
builds under CI to abort on invalid file descriptors instead of simply
converting them to `INVALID_HANDLE_VALUE`.  If this becomes a problem
we may need to modify libuv to make its hook more configurable.
2019-11-15 09:23:47 -05:00
Brad King
0b9f1cc96b Merge branch 'upstream-KWSys' into win-no-error-popup
* upstream-KWSys:
  KWSys 2019-11-15 (329d8c7c)
2019-11-15 09:21:08 -05:00
Brad King
1d78e1a966 Merge topic 'cmFileLockPool-remove-dynamic-memory-usage'
8dd284bf19 cmFileLockPool: enhance items management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4041
2019-11-15 09:18:23 -05:00
Brad King
c1ae0532f3 Merge topic 'ctest_test-repeat'
28994115e8 ctest_test: Add option to REPEAT tests
42d5d8f425 cmCTestMultiProcessHandler: Hold repeat mode as a member
ed65b3e984 CTest: Rename internal APIs for --repeat options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4011
2019-11-15 09:17:26 -05:00
Brad King
aba3048055 Merge topic 'Fortran-line-continued-use'
154b8d1a27 Fortran: ignore CPP line directives in line-continued USE stmts
34b7dbbfc3 LexerParser: Regenerate parsers with bison 3.4.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4048
2019-11-15 09:16:29 -05:00