summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'help-variables-cmakecachefiledir-might-not-be-defined'Brad King2022-03-311-4/+3
|\ | | | | | | | | | | | | cf4100d7da Help: Add that CMAKE_CACHEFILE_DIR might not be defined Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7125
| * Help: Add that CMAKE_CACHEFILE_DIR might not be definedTobias Nießen2022-03-301-4/+3
| | | | | | | | | | | | | | CMake only sets `CMAKE_CACHEFILE_DIR` when writing `CMakeCache.txt`, so the variable will usually be undefined when `CMakeLists.txt` runs. Revise its documentation to clarify that `CMAKE_BINARY_DIR` should be used instead.
* | Merge branch 'release-3.23'Brad King2022-03-310-0/+0
|\ \
| * \ Merge topic 'help-json-length-empty-index' into release-3.23Brad King2022-03-311-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 2f0a3d43e1 Help: Fix string(JSON ... LENGTH ...) signature Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7126
* | \ \ Merge topic 'help-json-length-empty-index'Brad King2022-03-311-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 2f0a3d43e1 Help: Fix string(JSON ... LENGTH ...) signature Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7126
| * | | Help: Fix string(JSON ... LENGTH ...) signatureTobias Nießen2022-03-301-1/+1
| | |/ | |/| | | | | | | | | | The list of indices and/or member names is optional, i.e., can be empty. For example, string(JSON foo LENGTH "[0,0,0]") sets foo to 3.
* | | Merge branch 'release-3.23'Brad King2022-03-310-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'ninja_compile_database_understand_new_cuda_lang_variables' into ↵Brad King2022-03-312-15/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.23 f7c6b9833c CUDA: Ninja generator generates valid compile database Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7129
* | \ \ Merge topic 'ninja_compile_database_understand_new_cuda_lang_variables'Brad King2022-03-312-15/+21
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | f7c6b9833c CUDA: Ninja generator generates valid compile database Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7129
| * | | CUDA: Ninja generator generates valid compile databaseRobert Maynard2022-03-302-15/+21
| | |/ | |/| | | | | | | | | | | | | | | | The ninja generator has been updated to poperly write the compile database when the CUDA language has been enabled. Fixes #23368
* | | Merge branch 'release-3.23'Brad King2022-03-310-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'CMakeDependentOption-doc-improvement' into release-3.23Brad King2022-03-311-7/+12
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 7a614977f9 CMakeDependentOption: improve documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rui Oliveira <ruimail24@gmail.com> Merge-request: !7124
* | | Merge topic 'CMakeDependentOption-doc-improvement'Brad King2022-03-311-7/+12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 7a614977f9 CMakeDependentOption: improve documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rui Oliveira <ruimail24@gmail.com> Merge-request: !7124
| * | CMakeDependentOption: improve documentationBen Boeckel2022-03-301-7/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | This makes it far clearer that `<depends>` is a list up front instead of burying the lede because a list is generally "trivially true" in CMake[1]. Also clarify that `<force>` is only available as a local variable and if queried outside of the "scope" of the `cmake_dependent_option` call, will get the stored user cache value. [1] The exception being when the last entry ends in `-NOTFOUND`. Suggested-by: Rui Oliveira
* | CMake Nightly Date StampKitware Robot2022-03-311-1/+1
| |
* | Merge topic 'verify-header-sets'Brad King2022-03-3047-0/+478
|\ \ | | | | | | | | | | | | | | | | | | | | | c798744f81 FILE_SET: Add VERIFY_HEADER_SETS target property Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7085
| * | FILE_SET: Add VERIFY_HEADER_SETS target propertyKyle Edwards2022-03-2947-0/+478
| | | | | | | | | | | | Fixes: #23338
* | | Merge topic 'FindHDF5-library'Brad King2022-03-301-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4e309f165 FindHDF5: Add explicit library location instead of guessed library name. Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !7105
| * | | FindHDF5: Add explicit library location instead of guessed library name.مهدي شينون (Mehdi Chinoune)2022-03-221-4/+4
| | | |
* | | | Merge topic 'preserve-compiler-arg1'Brad King2022-03-306-14/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 211a9deac1 Preserve CMAKE_${lang}_COMPILER_ARG1 from existing CMakeCache.txt b4de4217ae Tests: Simplify RunCMake.CompilerArgs no-clean cases Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7122
| * | | | Preserve CMAKE_${lang}_COMPILER_ARG1 from existing CMakeCache.txtKlein, Thorsten (BSH)2022-03-296-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CMAKE_<LANG>_COMPILER` may be a list if it was defined by a toolchain file. In this case we move the args to `CMAKE_<LANG>_COMPILER_ARG1`. If `CMAKE_<LANG>_COMPILER` is not a list, then it might have been cached by a previous run that split the `CC` or `CXX` environment variable into `CMAKE_<LANG>_COMPILER` and `CMAKE_<LANG>_COMPILER_ARG1`. In this latter case, avoid clobbering `CMAKE_<LANG>_COMPILER_ARG1`. Fixes: #23358
| * | | | Tests: Simplify RunCMake.CompilerArgs no-clean casesBrad King2022-03-291-12/+7
| | | | | | | | | | | | | | | | | | | | Also distinguish between the toolchain and env cases in the output.
* | | | | Merge topic 'framework-consumption-during-compilation'Brad King2022-03-306-4/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45ac71d8bc Ensure targets which are frameworks can be used freely Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: alcroito <alexandru.croitor@qt.io> Merge-request: !7121
| * | | | | Ensure targets which are frameworks can be used freelyMarc Chevrier2022-03-296-4/+53
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure flag -F/path/to/framework is specified during compilation step of consumers of the framework. Fixes: #23336
* | | | | CMake Nightly Date StampKitware Robot2022-03-301-1/+1
| | | | |
* | | | | Merge branch 'release-3.23'Brad King2022-03-290-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | CMake 3.23.0v3.23.0Brad King2022-03-291-1/+1
| | | | |
* | | | | Merge topic 'set-env-var-first-run'Brad King2022-03-2915-6/+82
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05e510bf0b CMP0132: Don't set compiler environment variables on first run 774a9eb210 Tests: Reorder CMP0129 test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7108
| * | | | | CMP0132: Don't set compiler environment variables on first runCraig Scott2022-03-2915-2/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running CMake for the first time in a build tree, for some generators CMake would set compiler environment variables like CC, CXX, etc. when the corresponding language is enabled. That behavior was never documented and can result in different behavior between the first and subsequent runs. Add a policy to no longer set those environment variables. Fixes: #21378
| * | | | | Tests: Reorder CMP0129 testCraig Scott2022-03-261-4/+6
| | | | | | | | | | | | | | | | | | Move the CMP0129 tests up to be with the other policy tests.
* | | | | | Merge topic 'fix-23191'Brad King2022-03-296-15/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd46db1745 Trace: process else and elseif commands correctly Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !7118
| * | | | | | Trace: process else and elseif commands correctlyBraulio Valdivielso Martinez2022-03-256-15/+39
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There have been two bugs reported about the `else` and `elseif` commands in the context of the tracing functionality and the json-v1 format (#23191 #22315). In essence, the reported traces referred to the layer of the stacktrace immediately on top of the expected ones. This MR fixes both issues. My solution adds a new parameter to the `PrintCommandTrace` function, `commandMissingFromStack`, that callers can specify if the command they want to report a trace for is not a regular part of the stack maintained in `cmMakefile`. This is only the case for `else` and `elseif`. The other bug is fixed by having the caller pass a `cmListFileBacktrace`, which helps in getting the right lines, file names... for the reported command. Fixes: #23191 #22315
* | | | | | Merge topic 'vim-indent-close-parens'Brad King2022-03-291-20/+28
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | b14cfbe159 vim: Fix indentation of 'closing parens only lines' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7106
| * | | | | vim: Fix indentation of 'closing parens only lines'Kai Tetzlaff2022-03-221-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the indentation of lines which contain only closing parentheses (`)`). Example: Change ``` add_library(mylib mysrc.c ) ``` to: ``` add_library(mylib mysrc.c ) ``` There are edge cases, where the indentation still doesn't really work. Example: This, admittedly weird, piece of code (manually formatted to what I would expect - this is already a personal preference ...): ``` if(4) if((0 OR 1 ) ) # could also be aligned with the `i` in `if` set(foobar ) endif() set(foobar) endif() ``` will be changed to: ``` if(4) if((0 OR 1 ) ) set(foobar ) endif() set(foobar) endif() ``` whereas with the previous vim indentation code the result would have been: ``` if(4) if((0 OR 1 ) ) set(foobar ) endif() set(foobar) endif() ``` which is not great but better than above. I hope that this is acceptable. Note: Apart from the actual indentation fixes, I based the change on a version of indent/cmake.vim I found in the debian/bookworm vim82 package which is newer than the one in the cmake repository (with `Last Change: 2017 Sep 24` comment instead of the cmake repo version with `Last Change: 2017 Aug 30`). This vim82/debian version moved these two lines: ``` let s:keepcpo= &cpo set cpo&vim ``` a bit further down (after an early exit check - which seems to make sense to me). Fixes: #22394
* | | | | | CMake Nightly Date StampKitware Robot2022-03-291-1/+1
| | | | | |
* | | | | | Merge topic 'variable-link-feature-supported'Brad King2022-03-2818-11/+66
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1777883f8b genex-LINK_(LIBRARY|GROUP) features: update variables behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7113
| * | | | | genex-LINK_(LIBRARY|GROUP) features: update variables behaviorMarc Chevrier2022-03-2518-11/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Variable CMAKE_LINK_(LIBRARY|GROUP)_USING_<FEATURE>_SUPPORTED is evaluated only if CMAKE_<LANG>_LINK_(LIBRARY|GROUP)_USING_<FEATURE>_SUPPORTED is not defined. This new behavior enable to activate a feature globally on a platform and to disable it for some compilers and languages.
* | | | | | Merge branch 'release-3.23'Brad King2022-03-280-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'cpack-ifw-validate-input' into release-3.23Brad King2022-03-281-2/+22
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e41f1ef6ff CPack/IFW: Add missing referenced source file validation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Konstantin Podsvirov <konstantin@podsvirov.pro> Merge-request: !7116
* | \ \ \ \ \ Merge topic 'cpack-ifw-validate-input'Brad King2022-03-281-2/+22
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e41f1ef6ff CPack/IFW: Add missing referenced source file validation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Konstantin Podsvirov <konstantin@podsvirov.pro> Merge-request: !7116
| * | | | | | CPack/IFW: Add missing referenced source file validationCraig Scott2022-03-251-2/+22
| | | | | | |
* | | | | | | Merge branch 'release-3.23'Brad King2022-03-280-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'doc-cpack-ifw' into release-3.23Brad King2022-03-281-101/+122
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db774e9108 Help: Clean up and expand CPack/IFW docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7115
* | \ \ \ \ \ \ Merge topic 'doc-cpack-ifw'Brad King2022-03-281-101/+122
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db774e9108 Help: Clean up and expand CPack/IFW docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7115
| * | | | | | | Help: Clean up and expand CPack/IFW docsCraig Scott2022-03-271-101/+122
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'release-3.23'Brad King2022-03-280-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'cpack-ifw-4.3' into release-3.23Brad King2022-03-281-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 343ed1f913 CPack/IFW: Add support for QtIFW 4.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7114
* | \ \ \ \ \ \ Merge topic 'cpack-ifw-4.3'Brad King2022-03-281-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 343ed1f913 CPack/IFW: Add support for QtIFW 4.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7114
| * | | | | | | CPack/IFW: Add support for QtIFW 4.3Craig Scott2022-03-251-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'release-3.23'Brad King2022-03-280-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
generated by cgit v0.12 at 2025-01-23 22:40:24 (GMT)