mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 20:29:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,039 Commits 2 Branches 401 Tags
78ff24a3a778805e5ffa8b44e26d04cd283ff52a
Commit Graph

50039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 78ff24a3a7 Help: Use singular placeholder name in cmake_language signature 2020-09-29 10:00:23 -04:00
Brad King edd60d4419 Tests: Simplify RunCMake.cmake_language invalid command cases 2020-09-29 06:24:51 -04:00
Brad King 1a5bf8245e cmMakefile: Clarify name of internal list file run method 2020-09-29 06:03:15 -04:00
Brad King 39677de5e2 Merge topic 'simplify-execution-context' 
07c1bdda3d cmMakefile: Replace GetExecutionFilePath with the top of the Backtrace
727ed0c403 cmMakefile: Simplify ExpandArguments signature
e456dae669 cmConditionEvaluator: Remove extra copy of execution context
0100a4943e cmMakefile: Remove now-unused overload of GetBacktrace
dc49abcb89 if,while: Clarify condition backtrace construction
68af831505 cmMakefile: Inline GetExecutionContext at call sites
280f3918f3 cmMakefile: Simplify GetExecutionContext implementation
0e59b45dfc cmListFileCache: Add explicit constructors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5276
 2020-09-29 05:58:25 -04:00
Brad King 1382002ae2 Merge topic 'ctest_launch_report_make_errors' 
a8b7dd061b ctest: improve Unicode support for launchers
ab9ad2a6a0 ctest: report make-level errors to CDash when using launchers
56e4e942d2 ctest: split launcher XML writer into separate class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zack Galbreath <zack.galbreath@kitware.com>
Merge-request: !5266
 2020-09-29 05:51:25 -04:00
Brad King ede7a32ef6 Merge topic 'refactor-cmprop' 
c88dde2869 cmGeneratorTarget: internal refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5289
 2020-09-29 05:50:45 -04:00
Brad King 275c7be867 Merge topic 'return-cmprop' 
d298ae7470 cmake::GetCacheDefinition: Return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5288
 2020-09-29 05:49:48 -04:00
Brad King a456dd6c26 Merge topic 'system_include_dir_caching_pre_lang' 
b6418155f3 cmGeneratorTarget: Include Cache now occurs per language+config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5274
 2020-09-29 05:48:11 -04:00
Brad King 0021d24fb3 Merge topic 'add_lang_agnostic_check_compile_flag_module' 
90dead024c CheckCompilerFlag: unified way to check compiler flags per language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5281
 2020-09-29 05:45:07 -04:00
Brad King ce6f085f31 Merge branch 'release-3.18' 2020-09-29 05:39:59 -04:00
Brad King 27f3b75a7d Merge topic 'vs-c11' 
b11c723678 VS: Populate `std:c{11,17}` flag table entries for v142

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5290
 2020-09-29 05:39:59 -04:00
Brad King 7d4e9a3a3a Merge topic 'vs-c11' into release-3.18 
b11c723678 VS: Populate `std:c{11,17}` flag table entries for v142

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5290
 2020-09-29 05:39:59 -04:00
Brad King 59d84ab9f3 Merge topic 'update-guides' 
9b988d9e57 Help: Cleanup guides

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5280
 2020-09-29 05:38:55 -04:00
Brad King 9978889c56 Merge topic 'user-interaction-images' 
0aea38d25e Help: Change User Interaction image paths to be relative to source file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5279
 2020-09-29 05:37:44 -04:00
Kitware Robot cf2f440658 CMake Nightly Date Stamp 2020-09-29 00:01:15 -04:00
Brad King b11c723678 VS: Populate std:c{11,17} flag table entries for v142 
The `-std:c11` option added by commit f7347f28c7 (MSVC: Record support
for C11 and c_restrict, 2020-08-09, v3.18.2~9^2) needs this flag table
entry to map in the VS IDE properly.

Issue: #21069
 2020-09-28 15:51:01 -04:00
vvs31415 c88dde2869 cmGeneratorTarget: internal refactoring 2020-09-28 10:37:25 -07:00
Zack Galbreath a8b7dd061b ctest: improve Unicode support for launchers 
Fix launcher behavior for international characters in the path on Windows.
 2020-09-28 13:13:52 -04:00
Zack Galbreath ab9ad2a6a0 ctest: report make-level errors to CDash when using launchers 
Fixes: #19545
 2020-09-28 13:13:52 -04:00
Zack Galbreath 56e4e942d2 ctest: split launcher XML writer into separate class 
This refactor will allow us to more easily add additional warnings and errors
to builds that use launchers.
 2020-09-28 13:13:52 -04:00
vvs31415 d298ae7470 cmake::GetCacheDefinition: Return cmProp 2020-09-28 09:32:22 -07:00
Brad King dd0743fdf8 Merge topic 'ci-tweaks' 
e80362252f ci: support a max parallelism for tests
93a745683b sccache: use a different port for CMake builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5287
 2020-09-28 11:29:40 -04:00
Ben Boeckel e80362252f ci: support a max parallelism for tests 
Machines may have more cores than testing actually supports.
 2020-09-28 09:57:24 -04:00
Ben Boeckel 93a745683b sccache: use a different port for CMake builds 
This avoids server reuse between different projects on the same machine.
 2020-09-28 09:55:42 -04:00
Brad King 07c1bdda3d cmMakefile: Replace GetExecutionFilePath with the top of the Backtrace 
The execution file path stack and the backtrace stack are kept in sync.
At all call sites of `GetExecutionFilePath`, the execution file path
matches the path in the context at the top of the backtrace stack.
 2020-09-28 09:49:08 -04:00
Brad King 727ed0c403 cmMakefile: Simplify ExpandArguments signature 
The only call sites that pass the explicit file name argument are in
function blocker `ArgumentsMatch` methods for `function` and `macro`.
We already ensure that they are balanced within a file scope, and the
RAII helpers `BuildsystemFileScope` and `ListFileScope` ensure that the
backtrace and execution list file stacks unwind to the matching level.
Therefore we can assume that the file name where we are checking for
matching arguments matches starting file name where those arguments
first appeared, and do not need to pass it explicitly.
 2020-09-28 09:49:08 -04:00
Brad King e456dae669 cmConditionEvaluator: Remove extra copy of execution context 
The execution context passed to the constructor always matches the top
of the backtrace, so the former can be removed in favor of using only
the latter.
 2020-09-28 09:49:08 -04:00
Brad King 0100a4943e cmMakefile: Remove now-unused overload of GetBacktrace 2020-09-28 09:49:08 -04:00
Brad King dc49abcb89 if,while: Clarify condition backtrace construction 
Evaluation of the `elseif`, `else`, and `while` commands takes place
during function blocker evaluation before any actual command execution
takes place.  Therefore they do not have an entry in the backtrace
stack.  Each of their implementations needs to construct an extra
backtrace entry to use in error messages and such.  Each of them used a
slightly different approach due to evolution over time.  Clean up their
construction of the extra backtrace entry and use a named variable to
contain it for clarity.
 2020-09-28 09:49:08 -04:00
Brad King 68af831505 cmMakefile: Inline GetExecutionContext at call sites 
The method only had one line, and its implementation is more clear
at the call sites than the method name.
 2020-09-28 09:49:07 -04:00
Brad King 280f3918f3 cmMakefile: Simplify GetExecutionContext implementation 
This method takes the function name and line from the top of the
current backtrace and then gets the file path from the state's
`GetExecutionListFile`.  This exactly matches what the `cmMakefileCall`
constructor does to create the top of the current backtrace anyway,
so we can just take that directly.
 2020-09-28 09:49:07 -04:00
Brad King 0e59b45dfc cmListFileCache: Add explicit constructors 
In order to construct with an initializer list in pure C++11, add
the explicit constructors.
 2020-09-28 09:46:34 -04:00
Brad King 1b03ac7da7 Merge topic 'ci-cxx11' 
a258283160 ci: convert one build to cover strict C++11 usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5285
 2020-09-28 09:39:53 -04:00
Brad King a258283160 ci: convert one build to cover strict C++11 usage 
Without this, we do not cover compilation with only C++11 until nightly
testing, at which point many builds require it, and failures block
merging anything that was staged.
 2020-09-28 09:23:31 -04:00
Robert Maynard 90dead024c CheckCompilerFlag: unified way to check compiler flags per language 2020-09-28 09:07:54 -04:00
Kyle Edwards 071755c3ef Merge topic 'cmake-gui-slot-connections' 
ab8f6fdd8c CMake GUI: Modernize signal-slot connections

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5278
 2020-09-28 09:01:47 -04:00
Brad King 20bd9c2674 Merge topic 'vs-generator-platform-install-prefix' 
561d4b4a47 VS: Fix CMAKE_INSTALL_PREFIX with GENERATOR_PLATFORM for x64 and ARM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5272
 2020-09-28 08:44:48 -04:00
Brad King 9e0da9ea2b Merge topic 'pkg_config_detailed_error' 
ab8bd48352 FindPkgConfig: Search for pkg-config.bat file on a Windows host
3201dd521e FindPkgConfig: Show more info when pkg-config --version fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5273
 2020-09-28 08:44:09 -04:00
Brad King c442c59757 Merge topic 'xcode-restore-ios-tests' 
2092ab08fe xcode: conditionally enable combined install tests
62ce9e16e0 xcode: annotate test output with selected SDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5271
 2020-09-28 08:41:47 -04:00
Brad King 7fcd5d75f2 Merge topic 'FPHSA-fix-spurious-error' 
1e82b1c4bc FPHSA: avoid spurious error if version variable is not defined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5277
 2020-09-28 08:41:02 -04:00
Brad King 13e0a0d74e Merge topic 'libuv-qnx' 
f9e950d4c5 libuv: Add support for building for QNX within CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5200
 2020-09-28 08:39:54 -04:00
Brad King 99f92d55d6 Merge topic 'FindJNI-aarch64' into release-3.18 
696d16ae6c FindJNI: Add aarch64 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vitaly Lipatov <lav@etersoft.ru>
Merge-request: !5275
 2020-09-28 08:38:54 -04:00
Brad King b050fe532f Merge branch 'release-3.18' 2020-09-28 08:38:54 -04:00
Brad King c47293fe9f Merge topic 'FindJNI-aarch64' 
696d16ae6c FindJNI: Add aarch64 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vitaly Lipatov <lav@etersoft.ru>
Merge-request: !5275
 2020-09-28 08:38:54 -04:00
Kitware Robot 97626b1dec CMake Nightly Date Stamp 2020-09-28 00:01:22 -04:00
Kyle Edwards ab8f6fdd8c CMake GUI: Modernize signal-slot connections 
Qt5 supports passing function pointers to QObject::connect(), and
prefers this over SIGNAL() and SLOT(). Modernize the connections,
stop using a deprecated signal from QComboBox, and modernize a few
QKeySequence's.
 2020-09-27 12:06:54 -04:00
Kitware Robot 558ce94016 CMake Nightly Date Stamp 2020-09-27 00:01:10 -04:00
Kitware Robot f68a21dc5c CMake Nightly Date Stamp 2020-09-26 00:01:12 -04:00
Betsy McPhail 9b988d9e57 Help: Cleanup guides 
* Move sections to be same level as Introduction in "Using Dependecies"
* Rename "Importing Exporting Targets" to "Importing Exporting Guide"
* Add an Introduction header to the Tutorial and Importing Exporting Guide
 2020-09-25 15:29:05 -04:00
Betsy McPhail 0aea38d25e Help: Change User Interaction image paths to be relative to source file 2020-09-25 14:45:01 -04:00