summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-P-args'Brad King2022-03-184-4/+23
|\ | | | | | | | | | | | | | | 36056ff5a3 cmake: Improve acceptance of arbitrary arguments in -P script mode Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7083
| * cmake: Improve acceptance of arbitrary arguments in -P script modeBrad King2022-03-174-4/+23
| | | | | | | | | | | | | | The fix in commit e4f1b301fe (cmake: Allow arbitrary args passed to CMake script, 2020-05-04, v3.18.0-rc1~211^2) only applied to "cache" arguments like `-DFOO`. Extend the fix to allow arbitrary arguments that collide with other CMake arguments like `-S` and `-B`.
* | Merge branch 'release-3.23'Brad King2022-03-180-0/+0
|\ \
| * \ Merge branch 'release-3.22' into release-3.23Brad King2022-03-180-0/+0
| |\ \
* | \ \ Merge branch 'release-3.22'Brad King2022-03-180-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'FindPython-pypy-specify-versions' into release-3.22Brad King2022-03-171-10/+25
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !7081
* | \ \ \ Merge branch 'release-3.23'Brad King2022-03-180-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'FindPython-pypy-specify-versions' into release-3.23Brad King2022-03-181-10/+25
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 2834cea155 FindPython: fix various problems using pypy interpreters Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7081
* | | | | Merge topic 'FindPython-pypy-specify-versions'Brad King2022-03-181-10/+25
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 2834cea155 FindPython: fix various problems using pypy interpreters Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7081
| * | | | FindPython: fix various problems using pypy interpretersMarc Chevrier2022-03-171-10/+25
| | |/ / | |/| | | | | | | | | | | | | | | | | | * add more possible directories for include file search * enhance version detection from library and include files * search for file pypy_decl.h when PyPy.h is not defined
* | | | Merge branch 'release-3.23'Brad King2022-03-180-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'always_prefer_last_source_dir' into release-3.23Brad King2022-03-183-24/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b44ad7992a cmake: Always prefer the last source directory provided Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7084
* | \ \ \ Merge topic 'always_prefer_last_source_dir'Brad King2022-03-183-24/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | b44ad7992a cmake: Always prefer the last source directory provided Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7084
| * | | | cmake: Always prefer the last source directory providedRobert Maynard2022-03-173-24/+8
| | | | | | | | | | | | | | | | | | | | Fixes: #23334
* | | | | CMake Nightly Date StampKitware Robot2022-03-181-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release-3.23'Brad King2022-03-170-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'FindPostgreSQL-doc-versions' into release-3.23Brad King2022-03-171-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcc0119af0 FindPostgreSQL: Update known versions in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7080
* | \ \ \ Merge topic 'FindPostgreSQL-doc-versions'Brad King2022-03-171-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | fcc0119af0 FindPostgreSQL: Update known versions in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7080
| * | | | FindPostgreSQL: Update known versions in documentationKai Pastor2022-03-171-1/+1
| | | | |
* | | | | Merge branch 'release-3.23'Brad King2022-03-170-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'doc-src-bld-selection' into release-3.23Brad King2022-03-171-0/+20
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | fea270d3ed Help: Document cmake source and binary dir selection rules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7076
* | | | | Merge topic 'doc-src-bld-selection'Brad King2022-03-171-0/+20
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | fea270d3ed Help: Document cmake source and binary dir selection rules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7076
| * | | | Help: Document cmake source and binary dir selection rulesRobert Maynard2022-03-171-0/+20
| | | | | | | | | | | | | | | | | | | | Co-authored-by: Brad King <brad.king@kitware.com>
* | | | | Merge branch 'release-3.23'Brad King2022-03-170-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'tll-genex-concat' into release-3.23Brad King2022-03-174-2/+55
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | add64399c5 target_link_libraries: Restore LINK_ONLY for multiple static lib dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7078
* | | | | Merge topic 'tll-genex-concat'Brad King2022-03-174-2/+55
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | add64399c5 target_link_libraries: Restore LINK_ONLY for multiple static lib dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7078
| * | | | target_link_libraries: Restore LINK_ONLY for multiple static lib dependenciesBrad King2022-03-164-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c1e812ad4f (target_link_libraries: Improve tolerance of unquoted generator expressions, 2022-02-15, v3.23.0-rc2~11^2) we accumulate consecutive non-keyword arguments to recover an unquoted generator expression as a single entry. When given multiple consecutive non-genex library names, the grouping breaks our logic that expects each entry is either a raw target name or a genex. Revise the logic to only accumulate multiple arguments when they end inside a partial genex. This bug caused `target_link_libraries` to stop wrapping static library private dependencies in `$<LINK_ONLY:...>` for `INTERFACE_LINK_LIBRARIES` when multiple consecutive library names are given. Add a test case covering that behavior. Fixes: #23302
* | | | | Merge topic 'cuda-arch-native'Brad King2022-03-173-2/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff8c0e9c10 ci: Clamp CUDA 'native' architecture to values supported by its toolkit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7074
| * | | | | ci: Clamp CUDA 'native' architecture to values supported by its toolkitBrad King2022-03-163-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `native` architecture compiles for the host's GPUs, but our CI jobs may may run on hosts with GPUs newer than supported by their version of the CUDA toolkit. Add an undocumented environment variable to tell CMake to clamp the native architecture to that supported by the toolkit. Without this, we may try to compile for architectures not supported by the CUDA Toolkit, which fails. Since commit d1b48bfabd (CUDA: Add support for CUDA_ARCHITECTURES=native, 2022-03-04), our CUDA 9.2 CI job fails when it runs on a CI host with a GPU architecture newer than that CUDA 9.2 supports. Clamping the architecture level fixes that. Do not document this clamp behavior publicly, at least for now. Users can be responsible for building with a CUDA toolkit recent enough to support their host's GPUs. Issue: #22375
* | | | | | CMake Nightly Date StampKitware Robot2022-03-171-1/+1
| | | | | |
* | | | | | Merge topic 'findzlib-static'Brad King2022-03-162-2/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 185723461f FindZLIB: more library names + option to prefer static library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7067
| * | | | | | FindZLIB: more library names + option to prefer static libraryPeter Würth2022-03-122-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds additional library names `zlibstat[d]` and `zlibvc[d]` for Windows, when zlib is built using one of the Visual Studio solutions under `zlib/contrib/vstudio`. Adds a `ZLIB_USE_STATIC_LIBS` option that is equivilent to similar settings in other modules such as FindProtobuf, FindOpenSSL, etc. Implements #18029 and #23140
* | | | | | | Merge topic 'cm_cxx_filesystem.cxx-revert-erroneous-change'Brad King2022-03-161-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10689e564f cm_cxx_filesystem.cxx: revert erroneous change Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7072
| * | | | | | | cm_cxx_filesystem.cxx: revert erroneous changeMarc Chevrier2022-03-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert erroneous change introduced by commit 0a81ea1.
* | | | | | | | Merge topic 'FindMatlab-test-2021'Brad King2022-03-161-6/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b324139a1 Tests: Fix FindMatlab.r2018a_check case in MATLAB R2021a and R2021b Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7071
| * | | | | | | | Tests: Fix FindMatlab.r2018a_check case in MATLAB R2021a and R2021bSilvio Traversaro2022-03-151-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a version-as-float comparison bug in the test.
* | | | | | | | | Merge branch 'release-3.23'Brad King2022-03-160-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge topic 'doc-list-semicolons' into release-3.23Brad King2022-03-164-13/+56
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8abd714176 Help: Clarify that ENVIRONMENT test properties take ;-separated lists 02cf404ace Help: Add advice for dealing with semicolons in lists c4117d9116 ExternalProject: Document that LIST_SEPARATOR works for CMAKE_ARGS too Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !7066
* | \ \ \ \ \ \ \ \ Merge topic 'doc-list-semicolons'Brad King2022-03-164-13/+56
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8abd714176 Help: Clarify that ENVIRONMENT test properties take ;-separated lists 02cf404ace Help: Add advice for dealing with semicolons in lists c4117d9116 ExternalProject: Document that LIST_SEPARATOR works for CMAKE_ARGS too Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !7066
| * | | | | | | | | Help: Clarify that ENVIRONMENT test properties take ;-separated listsBrad King2022-03-152-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up commit 79f64cc773 (Help: ENVIRONMENT_MODIFICATION clarify only supports singular values, 2022-02-23) to specifically call out the list format. Issue: #23315
| * | | | | | | | | Help: Add advice for dealing with semicolons in listsBrad King2022-03-151-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #23315
| * | | | | | | | | ExternalProject: Document that LIST_SEPARATOR works for CMAKE_ARGS tooBrad King2022-03-111-5/+5
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `CMAKE_ARGS` is used to construct the default `CONFIGURE_COMMAND` for CMake-based external projects, the `LIST_SEPARATOR` option works for it too.
* | | | | | | | | Merge branch 'release-3.23'Brad King2022-03-160-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'language-header-file-only-doc' into release-3.23Brad King2022-03-161-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83a80e5193 Help: Clarify interaction of LANGUAGE and HEADER_FILE_ONLY Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7075
* | \ \ \ \ \ \ \ \ Merge topic 'language-header-file-only-doc'Brad King2022-03-161-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83a80e5193 Help: Clarify interaction of LANGUAGE and HEADER_FILE_ONLY Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7075
| * | | | | | | | | Help: Clarify interaction of LANGUAGE and HEADER_FILE_ONLYKyle Edwards2022-03-151-2/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'release-3.23'Brad King2022-03-160-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'release-3.22' into release-3.23Brad King2022-03-160-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Merge branch 'release-3.22'Brad King2022-03-160-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'release-3.21' into release-3.22Brad King2022-03-160-0/+0
| |\ \ \ \ \ \ \ \
generated by cgit v0.12 at 2025-09-07 19:49:07 (GMT)