summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'correct_multiple_source_warnings'Brad 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 branch 'release-3.23'Brad King2022-02-180-0/+0
|\ \
| * \ 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
* | \ \ Merge topic 'file-set-no-exist'Brad 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.23'Brad King2022-02-180-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-3.22' into release-3.23Brad King2022-02-180-0/+0
| |\ \
* | \ \ Merge branch 'release-3.22'Brad King2022-02-180-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'test-qt-disable' into release-3.22Brad King2022-02-171-4/+8
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !6998
* | \ \ \ Merge branch 'release-3.23'Brad King2022-02-180-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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
* | | | | Merge topic 'test-qt-disable'Brad 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 branch 'release-3.23'Brad King2022-02-180-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | 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
* | | | Merge topic 'libarchive-openssl-crypto-checks'Brad 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
* | | | CMake Nightly Date StampKitware Robot2022-02-181-1/+1
| | | |
* | | | Merge topic 'test-try_compile-bindir'Brad King2022-02-172-18/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b47c4d0cd Tests: Use idiomatic try_compile calls in TryCompile test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6995
| * | | | Tests: Use idiomatic try_compile calls in TryCompile testBrad King2022-02-162-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Do not duplicate the `CMakeFiles/CMakeTmp` portion of the path. The `try_compile` command adds that automatically.
* | | | | Merge topic 'LINK_LIBRARY-updates'Brad King2022-02-1747-211/+216
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 397ee55cd6 genex-LINK_LIBRARY: rename configuration variables Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6994
| * | | | | genex-LINK_LIBRARY: rename configuration variablesMarc Chevrier2022-02-1647-211/+216
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | To be more consistent between genex and variables as well as the forecomming LINK_GROUP genex, rename variable *_LINK_USING_<FEATURE>* in *_LINK_LIBRARY_USING_<FEATURE>*
* | | | | Merge topic 'test-RunCMake-xcodebuild-incidental'Brad King2022-02-171-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ade07ef89 Tests: Teach RunCMake to ignore Xcode extension point warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6992
| * | | | | Tests: Teach RunCMake to ignore Xcode extension point warningsBrad King2022-02-161-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some Xcode versions, `xcodebuild` may warn: ... xcodebuild[...] Requested but did not find extension point with identifier ... Teach RunCMake to drop such incidental lines before matching against expected output.
* | | | | Merge branch 'release-3.23'Brad King2022-02-170-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'cmake-empty-cmd-line-arg'Brad 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 branch 'release-3.23'Brad King2022-02-170-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | \ \ \ \ \ Merge topic 'test-cuda-sepcomp-ptx'Brad 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.
* | | | | | | CMake Nightly Date StampKitware Robot2022-02-171-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'release-3.23'Brad King2022-02-160-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | | | | | Merge topic 'tll-genex-concat'Brad 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.23'Brad King2022-02-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-3.22' into release-3.23Brad King2022-02-160-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | Merge branch 'release-3.22'Brad King2022-02-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'FindGLUT-link-dirs' into release-3.22Brad King2022-02-151-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !6985
* | \ \ \ \ Merge branch 'release-3.23'Brad King2022-02-160-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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
* | | | | | Merge topic 'FindGLUT-link-dirs'Brad 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 branch 'release-3.23'Brad King2022-02-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
generated by cgit v0.12 at 2025-01-22 07:56:21 (GMT)