summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Improve wording and structure related to preset includesCraig Scott2022-03-025-43/+80
| | | | | | | | | | | Encourage placing preset includes near the beginning of a preset file and ensure the example shows that usage. Move the prose discussing includes to its own section to improve discoverability and break up paragraphs to make each main point harder to miss. Also clarify ${sourceDir} to remove any ambiguity with regard to its meaning in included files. Issue: #23214
* Merge topic 'ninja-gfortran-preprocess' into release-3.23Brad King2022-02-255-6/+24
|\ | | | | | | | | | | | | 6b4885b58b Ninja: Avoid preprocessing twice with explicit Fortran_PREPROCESS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7008
| * Ninja: Avoid preprocessing twice with explicit Fortran_PREPROCESSPeter Hill2022-02-245-6/+24
| | | | | | | | | | | | Fix spurious warnings from gfortran+Ninja for preprocessing. Fixes: #23248
* | Merge topic 'ghs_fix_rtos_dir' into release-3.23Brad King2022-02-241-2/+2
|\ \ | |/ |/| | | | | | | | | 005c7dc9e7 GHS: Store full path of Integrity OS directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7017
| * GHS: Store full path of Integrity OS directoryFred Baksik2022-02-231-2/+2
|/ | | | | | | | | | | | Fixes build project error because the OS directory was a relative path from the binary directory. Fixes issue during project regeneration where the `-os_dir` project option was missing because GHS_OS_DIR was not properly stored in the cache file. This error was introduced by commit aa59eaac4f (GHS: Allow setting GHS variables from toolchain file, 2021-11-15, v3.23.0-rc1~337^2).
* CMake 3.23.0-rc2v3.23.0-rc2Brad King2022-02-231-1/+1
|
* Merge topic 'update-expat' into release-3.23Brad King2022-02-237-64/+134
|\ | | | | | | | | | | | | | | | | | | 07f9ce4f8c Merge branch 'upstream-expat' into update-expat 4c031b9417 expat 2022-02-20 (65a21f2b) 9d035ba28d expat: Update script to get Expat 2.4.6 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7015
| * Merge branch 'upstream-expat' into update-expatBrad King2022-02-226-63/+133
| |\ | | | | | | | | | | | | | | | # By Expat Upstream * upstream-expat: expat 2022-02-20 (65a21f2b)
| | * expat 2022-02-20 (65a21f2b)Expat Upstream2022-02-226-63/+133
| | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit 65a21f2b2a306d29b44e70264aca948aa0454219 (R_2_4_6).
| * | expat: Update script to get Expat 2.4.6Brad King2022-02-221-1/+1
|/ /
* | Merge topic 'cuda-archs' into release-3.23Brad King2022-02-221-5/+3
|\ \ | | | | | | | | | | | | | | | | | | f75299b803 CUDA: Restore support for non-"all" CUDA_ARCHITECTURES with nvcc 11.5+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7007
| * | CUDA: Restore support for non-"all" CUDA_ARCHITECTURES with nvcc 11.5+Brad King2022-02-181-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 8f64df0a7c (CUDA: Generic all and all-major support, 2021-12-19, v3.23.0-rc1~23^2), setting `CUDA_ARCHITECTURES` to a value other than `all` or `all-major` is ignored with NVCC 11.5+. Fix the logic to return early only when actually using an "all" value. Fixes: #23243
* | | Merge topic 'CheckTypeSize-doc' into release-3.23Brad King2022-02-221-29/+36
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 65e4d29e35 CheckTypeSize: Modernize and clarify documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7006
| * | CheckTypeSize: Modernize and clarify documentationBrad King2022-02-181-29/+36
|/ / | | | | | | | | | | | | Spell out the list of result variables as a definition list rather than in prose. Fixes: #23247
* | Merge topic 'correct_multiple_source_warnings' into release-3.23Brad King2022-02-189-5/+105
|\ \ | | | | | | | | | | | | | | | | | | | | | 7083b19498 cmake: When given multiple source paths use last instead of first Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7001
| * | cmake: When given multiple source paths use last instead of firstRobert Maynard2022-02-179-5/+105
| | | | | | | | | | | | | | | | | | | | | | | | When given two source paths via `-S` or just directory paths prefer the last one. When the paths are mixed always prefer the last `-S` entry. Fixes: #23238
* | | Merge topic 'file-set-no-exist' into release-3.23Brad King2022-02-183-21/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 058b8a0bfb install(): Properly ignore FILE_SETs that don't exist Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7000
| * | | install(): Properly ignore FILE_SETs that don't existKyle Edwards2022-02-173-21/+27
| |/ / | | | | | | | | | Fixes: #22960
* | | Merge branch 'release-3.22' into release-3.23Brad King2022-02-180-0/+0
|\ \ \
| * \ \ Merge branch 'test-qt-disable' into release-3.22Brad King2022-02-171-4/+8
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !6998
* | \ \ \ Merge topic 'test-qt-disable' into release-3.23Brad King2022-02-181-4/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 5bfff3c750 Tests: Add missing guards on Qt4 and Qt5 tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6998
| * | | | Tests: Add missing guards on Qt4 and Qt5 testsBrad King2022-02-171-4/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing `CMake_TEST_Qt{4,5}` conditions on Qt4 an Qt5 tests. Configuring CMake with `-DCMake_TEST_Qt5=OFF` should prevent any attempt to search for Qt5. Fixes: #23239
* | | | Merge topic 'libarchive-openssl-crypto-checks' into release-3.23Brad King2022-02-181-0/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 483a1c248c libarchive: Fix OpenSSL crypto library checks for build inside CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6997
| * | | libarchive: Fix OpenSSL crypto library checks for build inside CMakeBrad King2022-02-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libarchive's crypto library checks use its `config.h` inside the `try_compile` project. Since commit ade3b16e63 (libarchive: Use KWIML to get fixed-size integer types, 2020-06-01, v3.18.0-rc1~33^2), that header depends on KWIML inside CMake. Add the include directory for KWIML to the crypto library checks. Otherwise, they always fail due to not finding the KWIML headers, and libarchive decides not to link the crypto library. libarchive has other code besides the hash algorithms that depends on the crypto library if its ENABLE_OPENSSL option is enabled (which in CMake is controlled by CMAKE_USE_OPENSSL). It seems to be missing some conditions to link the crypto library in those cases, and instead relies on at least one of the above-mentioned checks to pass. If they all fail, and we are using system curl, we might not link the crypto library. Fixes: #23234
* | | | Merge topic 'cmake-empty-cmd-line-arg' into release-3.23Brad King2022-02-1715-6/+60
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f73457ca2e cmake: Ignore any empty "" command line arguments 67f97f5478 Tests: Add RunCMake helper to run cmake with raw execute_process args Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6980
| * | | | cmake: Ignore any empty "" command line argumentsRobert Maynard2022-02-1614-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't treat empty quote arguments("") as the current working directory but instead ignore them. Fixes #23217
| * | | | Tests: Add RunCMake helper to run cmake with raw execute_process argsBrad King2022-02-161-2/+15
| | | | |
* | | | | Merge topic 'test-cuda-sepcomp-ptx' into release-3.23Brad King2022-02-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7ef59c9c4 Tests: Fix CudaOnly.SeparateCompilationPTX test project name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6991
| * | | | | Tests: Fix CudaOnly.SeparateCompilationPTX test project nameBrad King2022-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the test added by commit 61b9764b03 (CUDA: Allow both CUDA_SEPARABLE_COMPILATION and CUDA_PTX_COMPILATION, 2021-09-17, v3.23.0-rc1~516^2) to have a `project()` name matching what is passed to CTest's `--build-project` option. Otherwise, on VS builds, MSBuild warns: MSBUILD : error MSB1009: Project file does not exist. Other CUDA tests use a matching project name already.
* | | | | | Merge topic 'tll-genex-concat' into release-3.23Brad King2022-02-162-102/+148
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1e812ad4f target_link_libraries: Improve tolerance of unquoted generator expressions 5571a31648 target_link_libraries: Handle keyword arguments in dedicated code path 42590df9f9 target_link_libraries: Remove likely-broken ancient compatibility check Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6989
| * | | | | target_link_libraries: Improve tolerance of unquoted generator expressionsBrad King2022-02-152-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit 1d709ea2f5 (cmGeneratorTarget: Propagate backtraces from INTERFACE_LINK_LIBRARIES, 2021-12-15, v3.23.0-rc1~228^2), the value of `INTERFACE_LINK_LIBRARIES` was a single string. If an unquoted generator expression passed to `target_link_libraries` contained `;` and became multiple arguments, they would all accumulate as a single `;`-separated list in the value of `INTERFACE_LINK_LIBRARIES`. Since that commit, each argument to `target_link_libraries` is placed in `INTERFACE_LINK_LIBRARIES` as a separate entry, as has long been the case for `LINK_LIBRARIES`. That behavior change broke projects that were accidentally relying on accumulation in `INTERFACE_LINK_LIBRARIES` to produce complete generator expressions containing `;`. Teach `target_link_libraries` to accumulate consecutive non-keyword arguments into a single entry before placing them in `LINK_LIBRARIES` or `INTERFACE_LINK_LIBRARIES`. For example, treat `a b c` as if they were written as `"a;b;c"`. This restores the previously accidental support for unquoted generator expressions in `INTERFACE_LINK_LIBRARIES`, and also enables it for `LINK_LIBRARIES`. For now, do not drop the `target_link_libraries` documentation that recommends quoting generator expressions. Quoting is still important to populate `LINK_LIBRARIES` in CMake 3.22 and below, and is also good practice to keep generator expressions whole. Fixes: #23203
| * | | | | target_link_libraries: Handle keyword arguments in dedicated code pathBrad King2022-02-151-83/+100
| | | | | |
| * | | | | target_link_libraries: Remove likely-broken ancient compatibility checkBrad King2022-02-151-18/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit daa6d2bc04 (ENH: updated handling of debug and optimized target link libraries, 2006-11-29, v2.6.0~2471) the ancient `<lib>_LINK_TYPE` compatibility lookup was done using the name of the dependent target for which `target_link_libraries` is called, rather than the name of the library dependency being considered. This code probably does nothing. Remove it.
* | | | | Merge branch 'release-3.22' into release-3.23Brad King2022-02-160-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'FindGLUT-link-dirs' into release-3.22Brad King2022-02-151-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !6985
* | \ \ \ \ Merge topic 'FindGLUT-link-dirs' into release-3.23Brad King2022-02-161-0/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 44f7238d5d FindGLUT: Use link directories for libs from pkg-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6985
| * | | | | FindGLUT: Use link directories for libs from pkg-configSilvio Traversaro2022-02-151-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if available, 2021-06-11, v3.22.0-rc1~469^2), the `GLUT_LIBRARIES` may come from `pkg-config`, in which case they may be `-l` flags instead of absolute paths. Propagate `GLUT_LIBRARY_DIRS` to GLUT::GLUT too. Fixes: #23229
* | | | | Merge topic 'FindHDF5-info-binary-exists' into release-3.23Brad King2022-02-161-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 449f343498 FindHDF5: Tolerate failure during compiler interrogation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6983
| * | | | | FindHDF5: Tolerate failure during compiler interrogationAxel Huebl2022-02-151-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that the file that is accessed via `file(STRINGS...)` truly exists. This is not the case in some EMSCRIPTEN/WebASM builds where we want to overwrite the HDF5 find logic manually. The missing check here prevents that one can overwrite the search logic in exotic environments.
* | | | | Merge topic 'vs-package-restore-docs' into release-3.23Brad King2022-02-167-38/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d92469e572 Help: Clarify how package resolve mode is intended to be used f320a31087 cmake --build: prioritize --resolve-package-references over preset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6984
| * | | | | Help: Clarify how package resolve mode is intended to be usedCarsten Rudolph2022-02-153-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23223
| * | | | | cmake --build: prioritize --resolve-package-references over presetCarsten Rudolph2022-02-156-30/+29
| |/ / / / | | | | | | | | | | | | | | | Fixes: #23224
* | | | | Merge topic 'doc-vs-instance-version' into release-3.23Brad King2022-02-161-5/+22
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | e163908a76 Help: Clarify version specification in CMAKE_GENERATOR_INSTANCE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6982
| * | | | Help: Clarify version specification in CMAKE_GENERATOR_INSTANCEBrad King2022-02-151-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the documentation added by commit ec8d37b3b1 (VS: Support version specification in CMAKE_GENERATOR_INSTANCE, 2021-10-26, v3.23.0-rc1~452^2~1). Fixes: #23225
* | | | | Merge branch 'release-3.22' into release-3.23Brad King2022-02-150-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'FindMatlab-mcr911' into release-3.22Brad King2022-02-141-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !6976
* | \ \ \ \ Merge topic 'FindMatlab-mcr911' into release-3.23Brad King2022-02-151-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | b8d885ed0d FindMatlab: Fix version detection for MCR >= 9.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6976
| * | | | | FindMatlab: Fix version detection for MCR >= 9.10Tom M2022-02-141-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent MCR versions have the following `VersionInfo.xml`: <version>9.11.0.1837725</version> Fix parsing of multiple digits in the version components so that we do not mistake this for version `9.1`.
* | | | | Merge topic 'doc-example-package-components' into release-3.23Brad King2022-02-152-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5317015e68 Help: use package-specific var for supported component list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6975
| * | | | | Help: use package-specific var for supported component listConnor Imes2022-02-142-4/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always using `_supported_components` causes conflicts when transitive dependencies also set this variable, e.g., because the developers followed these code samples. An even more general approach could be to set `_${CMAKE_FIND_PACKAGE_NAME}_supported_components` instead, but such a change should then be applied to other variables for consistency. Fixes: #23112
generated by cgit v0.12 at 2024-11-11 15:53:12 (GMT)