mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-16 03:32:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
45,980 Commits 2 Branches 385 Tags
f7ca8fc24ccb4e7724d2228d9997b2df99e71133
Commit Graph

1640 Commits

Author SHA1 Message Date
Brad King
19f267c75e XL: Add support for Ninja and XL Fortran 
The Ninja generator's support for Fortran requires that source files
be preprocessed explicitly first.  However, the `xlf` compiler does
not have a simple `-E` option or equivalent to do preprocessing.
The only documented way to get preprocessed output is to use `-d`
to leave it behind, but only at an inflexible location.

Instead, create our own `cpp` wrapper script and substitute it for the
real preprocessor using `-tF -B ...`.  Teach the wrapper to map the
`cpp` output to the location we need and then invoke the real `cpp`
underneath.

Fixes: #19450
 2019-11-21 15:59:12 -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
Kyle Edwards
51c69fe5f8 FileAPI: Add "multiConfig" parameter to index file 2019-11-20 09:46: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
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
5aa94a1d0d Merge topic 'sdcc-sdar' 
5cf404d36f SDCC compiler: use sdar instead of sdcclib as librarian for recent versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4065
 2019-11-19 11:28:13 -05:00
Gregor Jasny
92c4c852db Xcode: Add custom working directory property 
Closes: #19967
 2019-11-18 22:34:34 +01:00
Johnny Jazeix
5cf404d36f SDCC compiler: use sdar instead of sdcclib as librarian for recent versions 
Fixes: #19988
 2019-11-18 20:12:49 +01:00
Jannick
c5fb36a4cb FindFLEX: Add policy CMP0098 to run flex in build tree 2019-11-15 11:46:06 -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
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
Johnny Jazeix
5239fc5c75 cmake -E: Add rm with improved semantics over remove and remove_directory 2019-11-13 18:02:18 -05:00
Sergey Larin
e6069613a1 CPack: Set background image in macOS installer 
Now you can set a background image and it's parameters in
productbuild and PackageMaker based installers.
 2019-11-08 14:09:25 -05:00
Brad King
28994115e8 ctest_test: Add option to REPEAT tests 2019-11-07 14:21:18 -05:00
Brad King
ce7408514c Merge topic 'install-name-dir-genex' 
a0e2e0ca97 Help: Add documentation and release notes for INSTALL_NAME_DIR genex
deeab72aae Tests: Add tests for INSTALL_NAME_DIR
3c85f11fed INSTALL_NAME_DIR: Add support for generator expressions
2ec1156b80 Refactor: Generalize cmExportInstallFileGenerator::ReplaceInstallPrefix()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3989
 2019-11-06 09:32:22 -05:00
Brad King
0ff5bdd4c9 Merge topic 'ccmake_colored_values' 
d5d5ba3f7f ccmake: Identify the current cache entry
005aba29a1 ccmake: Improve display of the key controls
93b66735ac ccmake: Use type-based colors to display cache values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3955
 2019-11-06 09:29:22 -05:00
Brad King
0618f8b3ed Merge topic 'cpack-nsis-welcome-finish-title' 
68b5af65fa CPack/NSIS: Add options for custom welcome/finish titles + display on 3 lines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3980
 2019-11-06 09:28:05 -05:00
Johnny Jazeix
68b5af65fa CPack/NSIS: Add options for custom welcome/finish titles + display on 3 lines 
Fixes: #11275
 2019-11-05 20:09:53 +01:00
Brad King
370fe1495b Merge topic 'remove_sh_error_mingw' 
82ddcf0db1 MinGW Makefiles: do not fail if sh.exe is present in the path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3978
 2019-11-05 11:32:58 -05:00
Kyle Edwards
a0e2e0ca97 Help: Add documentation and release notes for INSTALL_NAME_DIR genex 2019-11-04 19:02:16 -05:00
Craig Scott
9667996923 Merge topic 'message-check-types' 
7b2dd9dedc Refactor: Use added message types in various modules
949a1e120a message: New message types to mark checks performed by CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3689
 2019-11-04 14:11:45 -05:00
Sylvain Joubert
93b66735ac ccmake: Use type-based colors to display cache values 
The colors are based on the entry type (or value for booleans),
paths and filepaths sharing the same color.
 2019-11-04 18:59:20 +01:00
Johnny Jazeix
82ddcf0db1 MinGW Makefiles: do not fail if sh.exe is present in the path 
The check was added only to fail early in an environment known not to work
at the time:

* https://web.archive.org/web/20120912010035/http://lists.trolltech.com/qt-interest/2006-01/thread00091-0.html

Fixes: #19327
 2019-11-04 12:03:48 -05:00
Alex Turbov
949a1e120a message: New message types to mark checks performed by CMake 
Closes #19638.

Co-Authored-By: Craig Scott <craig.scott@crascit.com>
 2019-11-02 14:10:09 +02:00
Brad King
39ac8b4eb5 ctest: Add --repeat-after-timeout option 
Add an option to re-run tests if they timeout.  This will help tolerate
sporadic timeouts on busy machines.
 2019-10-29 15:14:36 -04:00
Brad King
80c2c9d14c ctest: Add --repeat-until-pass option 
Add an option to re-run tests if they fail.  This will help tolerate
sporadic failures.

Issue: #17010
Co-Author: Ben Boeckel <ben.boeckel@kitware.com>
Co-Author: Chuck Atkins <chuck.atkins@kitware.com>
 2019-10-29 15:10:12 -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
Brad King
f289ab61e3 Merge topic 'cpack-nsis-uninstaller-name' 
c97abc9688 CPack/NSIS: Add option for custom Uninstall filename

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3945
 2019-10-28 10:06:40 -04:00
Brad King
cb13aa580d Merge topic 'ExternalProject-git-no-recurse' 
5bc6230741 ExternalProject: Option to turn off recursive update of git submodules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3923
 2019-10-28 10:05:45 -04:00
Sylvain Joubert
2086da1713 ccmake: Add output and progress bar release note 2019-10-25 14:19:46 -04:00
Johnny Jazeix
c97abc9688 CPack/NSIS: Add option for custom Uninstall filename 
Fixes: #10728
 2019-10-25 14:13:25 -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
Charis Marangos
5bc6230741 ExternalProject: Option to turn off recursive update of git submodules 
Fixes: #19832
 2019-10-24 13:36:19 -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
Alex Turbov
2d1fd3f818 Help: Fix missed extension for CMAKE_MESSAGE_CONTEXT release note 2019-10-24 13:07:51 +02:00
Brad King
53f95dc5fb Merge topic 'export-compile-commands-environment-variable' 
8065a686dd Initialize CMAKE_EXPORT_COMPILE_COMMANDS from envvar of the same name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3914
 2019-10-21 11:23:47 -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
Daan De Meyer
8065a686dd Initialize CMAKE_EXPORT_COMPILE_COMMANDS from envvar of the same name 
Fixes: #18386
 2019-10-18 14:37:33 -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
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
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
Alexander Boczar
e7d57bc3c3 VS: Propagate CMAKE_VS_GLOBALS into custom targets 
Issue: #19708
 2019-10-17 10:19:01 -04:00
Alexander Boczar
45b4b4b930 VS: Propagate CMAKE_VS_GLOBALS into compiler id projects 
Issue: #19708
 2019-10-17 10:18:52 -04:00
Brad King
0e5a3ae7a9 Merge topic 'FindCURL-cmake-package' 
c11e7c5c3d FindCURL: Try to find CURLConfig.cmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3903
 2019-10-16 09:51:32 -04:00
Charles Barto
c11e7c5c3d FindCURL: Try to find CURLConfig.cmake 2019-10-15 13:56:28 -04:00
Alexander Boczar
548e9051a4 VS: Add support to override VCTargetsPath through toolset 
Fixes: #19708
 2019-10-15 13:28:45 -04:00
Charly Mourglia
89ff3ee779 VS: Add VS_DOTNET_DOCUMENTATION_FILE property 
Add a `VS_DOTNET_DOCUMENTATION_FILE` target property to tell VS
generators to add a `DocumentationFile` setting in `.csproj` files.

Fixes: #19784
 2019-10-15 11:44:55 -04:00
Alex Turbov
7cf79f4419 message: Support logging a context with each message 2019-10-12 18:21:36 +11:00