summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* gitlab-ci: re-organize packaging pipelineBrad King2020-09-293-15/+27
| | | | | Move the macOS package build job into the `build` stage. Since it depends on the sphinx doc package job, add a preceding `prep` stage.
* Merge topic 'simplify-execution-context'Brad King2020-09-2911-91/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * cmMakefile: Replace GetExecutionFilePath with the top of the BacktraceBrad King2020-09-282-13/+5
| | | | | | | | | | | | 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.
| * cmMakefile: Simplify ExpandArguments signatureBrad King2020-09-284-24/+12
| | | | | | | | | | | | | | | | | | | | | | 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.
| * cmConditionEvaluator: Remove extra copy of execution contextBrad King2020-09-284-19/+6
| | | | | | | | | | | | 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.
| * cmMakefile: Remove now-unused overload of GetBacktraceBrad King2020-09-282-10/+0
| |
| * if,while: Clarify condition backtrace constructionBrad King2020-09-282-15/+14
| | | | | | | | | | | | | | | | | | | | | | 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.
| * cmMakefile: Inline GetExecutionContext at call sitesBrad King2020-09-285-10/+5
| | | | | | | | | | The method only had one line, and its implementation is more clear at the call sites than the method name.
| * cmMakefile: Simplify GetExecutionContext implementationBrad King2020-09-281-6/+1
| | | | | | | | | | | | | | | | 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.
| * cmListFileCache: Add explicit constructorsBrad King2020-09-281-0/+8
| | | | | | | | | | In order to construct with an initializer list in pure C++11, add the explicit constructors.
* | Merge topic 'ctest_launch_report_make_errors'Brad King2020-09-2914-378/+504
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | ctest: improve Unicode support for launchersZack Galbreath2020-09-281-4/+2
| | | | | | | | | | | | Fix launcher behavior for international characters in the path on Windows.
| * | ctest: report make-level errors to CDash when using launchersZack Galbreath2020-09-289-11/+57
| | | | | | | | | | | | Fixes: #19545
| * | ctest: split launcher XML writer into separate classZack Galbreath2020-09-285-367/+449
| | | | | | | | | | | | | | | This refactor will allow us to more easily add additional warnings and errors to builds that use launchers.
* | | Merge topic 'refactor-cmprop'Brad King2020-09-292-29/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c88dde2869 cmGeneratorTarget: internal refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5289
| * | | cmGeneratorTarget: internal refactoringvvs314152020-09-282-29/+27
| | |/ | |/|
* | | Merge topic 'return-cmprop'Brad King2020-09-298-38/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d298ae7470 cmake::GetCacheDefinition: Return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5288
| * | | cmake::GetCacheDefinition: Return cmPropvvs314152020-09-288-38/+35
| |/ /
* | | Merge topic 'system_include_dir_caching_pre_lang'Brad King2020-09-297-4/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b6418155f3 cmGeneratorTarget: Include Cache now occurs per language+config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5274
| * | | cmGeneratorTarget: Include Cache now occurs per language+configRobert Maynard2020-09-257-4/+50
| | | | | | | | | | | | | | | | | | | | Previously only occurred per config which broke per-language system includes.
* | | | Merge topic 'add_lang_agnostic_check_compile_flag_module'Brad King2020-09-299-117/+128
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90dead024c CheckCompilerFlag: unified way to check compiler flags per language Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5281
| * | | | CheckCompilerFlag: unified way to check compiler flags per languageRobert Maynard2020-09-289-117/+128
| |/ / /
* | | | Merge branch 'release-3.18'Brad King2020-09-290-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'vs-c11' into release-3.18Brad King2020-09-291-0/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ Merge topic 'vs-c11'Brad King2020-09-291-0/+14
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | VS: Populate `std:c{11,17}` flag table entries for v142Brad King2020-09-281-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'update-guides'Brad King2020-09-293-4/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b988d9e57 Help: Cleanup guides Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5280
| * | | | | | Help: Cleanup guidesBetsy McPhail2020-09-253-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | Merge topic 'user-interaction-images'Brad King2020-09-292-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0aea38d25e Help: Change User Interaction image paths to be relative to source file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5279
| * | | | | | | Help: Change User Interaction image paths to be relative to source fileBetsy McPhail2020-09-252-5/+5
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2020-09-291-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'ci-tweaks'Brad King2020-09-283-0/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | ci: support a max parallelism for testsBen Boeckel2020-09-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Machines may have more cores than testing actually supports.
| * | | | | sccache: use a different port for CMake buildsBen Boeckel2020-09-282-0/+4
|/ / / / / | | | | | | | | | | | | | | | This avoids server reuse between different projects on the same machine.
* | | | | Merge topic 'ci-cxx11'Brad King2020-09-281-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | ci: convert one build to cover strict C++11 usageBrad King2020-09-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge topic 'cmake-gui-slot-connections'Kyle Edwards2020-09-287-149/+180
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | CMake GUI: Modernize signal-slot connectionsKyle Edwards2020-09-277-149/+180
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'vs-generator-platform-install-prefix'Brad King2020-09-281-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 561d4b4a47 VS: Fix CMAKE_INSTALL_PREFIX with GENERATOR_PLATFORM for x64 and ARM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5272
| * | | | | VS: Fix CMAKE_INSTALL_PREFIX with GENERATOR_PLATFORM for x64 and ARMRechi2020-09-251-0/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate the same default `CMAKE_INSTALL_PREFIX` if a project is configured with CMAKE_GENERATOR_PLATFORM (`cmake -G "Visual Studio [...]" -A x64` and `cmake -G "Visual Studio [...]" -A ARM`) instead of the prior CMake 3.1 way (`cmake -G "Visual Studio [...] Win64"` and `cmake -G "Visual Studio [...] ARM"`).
* | | | | Merge topic 'pkg_config_detailed_error'Brad King2020-09-281-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | FindPkgConfig: Search for pkg-config.bat file on a Windows hostAlexandru Croitor2020-09-251-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The strawberry perl distribution ships a pkg-config file and a pkg-config.bat file. find_program() does not usually look for a .bat file program unless explicitly specified in the NAMES argument. This would cause CMake to find the non-bat file, and executing that with execute_process() leads to a '%1 is not a valid Win32 application' error. Prefer to search for pkg-config.bat file when on a Windows host, in additiona to the regular pkg-config file. Fixes: #21239
| * | | | | FindPkgConfig: Show more info when pkg-config --version failsAlexandru Croitor2020-09-251-1/+3
| |/ / / / | | | | | | | | | | | | | | | Fixes: #21239
* | | | | Merge topic 'xcode-restore-ios-tests'Brad King2020-09-281-14/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | xcode: conditionally enable combined install testsGregor Jasny2020-09-251-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new Xcode 12 build system does not support recursive invocation. Therefore lazily triggered builds for the corresponding platform which run during the `install` target fail with: ``` error: unable to attach DB: error: accessing build database ``` While looking for a work-around we conditionally disable those tests. Issue: #21206
| * | | | | xcode: annotate test output with selected SDKGregor Jasny2020-09-251-8/+8
| | | | | |
* | | | | | Merge topic 'FPHSA-fix-spurious-error'Brad King2020-09-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e82b1c4bc FPHSA: avoid spurious error if version variable is not defined Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5277
| * | | | | | FPHSA: avoid spurious error if version variable is not definedMarc Chevrier2020-09-251-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Fixes: #21241
* | | | | | Merge topic 'libuv-qnx'Brad King2020-09-284-2/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9e950d4c5 libuv: Add support for building for QNX within CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5200
| * | | | | | libuv: Add support for building for QNX within CMakeElad Lahav2020-09-254-2/+26
| | |/ / / / | |/| | | |
generated by cgit v0.12 at 2025-01-22 16:13:36 (GMT)