summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindPkgConfig: Tolerate PKG_CONFIG_SYSTEM_LIBRARY_PATH in environmentBrad King2021-07-134-0/+48
| | | | | | | | Tell `pkg-config --libs` not to filter out `-L` flags for entries of `PKG_CONFIG_SYSTEM_LIBRARY_PATH` (and `LIBRARY_PATH` for `pkgconf`). We should always search everywhere the `.pc` file expects. Fixes: #22148
* Merge topic 'cpack-deb-lib-multiarch'Brad King2021-07-131-2/+4
|\ | | | | | | | | | | | | 68b961d361 CPack/DEB: Add postinst/postrm ldconfig for multi-arch lib dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6341
| * CPack/DEB: Add postinst/postrm ldconfig for multi-arch lib dirsAlex Turbov2021-07-121-2/+4
| | | | | | | | Fixes: #22411
* | Merge topic 'ctest-environment-modifications'Brad King2021-07-1325-5/+341
|\ \ | | | | | | | | | | | | | | | | | | | | | de4f1f26b0 CTest: add an ENVIRONMENT_MODIFICATION property 4c757fa3c8 Help/prop_test/ENVIRONMENT: clarify the scope of the changes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6299
| * | CTest: add an ENVIRONMENT_MODIFICATION propertyBen Boeckel2021-07-0924-3/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property allows projects to modify environment variables at test time rather than trying to guess what the state should be based on what is present at configure time. Of particular interest is the ability to use a `PATH` present at test time while adding entries known to be necessary for the test itself. There are multiple operations provided to modify variables, including: - setting and unsetting - appending and prepending as: - strings - path lists - CMake lists Additionally, a `reset` action is provided to cancel any prior modifications to that particular variable in the case of incremental additions to the test property.
| * | Help/prop_test/ENVIRONMENT: clarify the scope of the changesBen Boeckel2021-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | | The "restored" bit is an implementation detail as it could also be implemented by passing a crafted environment to `execve` or `CreateProcess` arguments. Instead, state that the environment changes only affects the test with the property set.
* | | Merge topic 'state-project-kind'Brad King2021-07-137-51/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c440ea3ce cmake: Model normal and try-compile project kinds explicitly 2065bd73cb cmState: Construct with mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6337
| * | | cmake: Model normal and try-compile project kinds explicitlyBrad King2021-07-126-35/+32
| | | | | | | | | | | | | | | | | | | | Construct with the project kind instead of mutating state after construction.
| * | | cmState: Construct with modeBrad King2021-07-124-19/+13
| | | |
* | | | Merge topic 'UseSWIG-dependencies-VS-generators'Brad King2021-07-133-8/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1bece92d5 UseSWIG: Use swig generated dependencies for Visual Studio Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6327
| * | | | UseSWIG: Use swig generated dependencies for Visual StudioMarc Chevrier2021-07-093-8/+25
| | | | |
* | | | | Merge topic 'ctest-libuv-exe-network-path'Brad King2021-07-131-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 113cc4c684 libuv: Allow windows UNC path with forward slashes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6330
| * | | | | libuv: Allow windows UNC path with forward slashesearnal2021-07-121-1/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix libuv issue 3159 in CMake while integration in upstream libuv is pending. Fixes: #22141
* | | | | Merge topic 'vs-CMAKE_MSVCIDE_RUN_PATH'Brad King2021-07-137-1/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 542bd343e3 VS: Always enable CMAKE_MSVCIDE_RUN_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6334
| * | | | | VS: Always enable CMAKE_MSVCIDE_RUN_PATHAsit Dhal2021-07-127-1/+17
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Do not require a language to be enabled. Fixes: #22343
* | | | | Merge branch 'release-3.21'Brad King2021-07-130-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'file-grd-arch' into release-3.21Brad King2021-07-135-6/+66
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2c03347b0 file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6339
* | \ \ \ \ \ Merge topic 'file-grd-arch'Brad King2021-07-135-6/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5aeda18297 file(GET_RUNTIME_DEPENDENCIES): Use cmELF unconditionally 17aa96bb7a Merge branch 'master' into file-grd-arch b2c03347b0 file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6339
| * | | | | | | file(GET_RUNTIME_DEPENDENCIES): Use cmELF unconditionallyKyle Edwards2021-07-121-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with CMake 3.22, cmELF.h is always available, so use it unconditionally.
| * | | | | | | Merge branch 'master' into file-grd-archKyle Edwards2021-07-12175-793/+3748
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| * | | | | | file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependenciesKyle Edwards2021-07-125-6/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22106
* | | | | | | Merge branch 'release-3.21'Brad King2021-07-130-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'doc-preset-example-v3' into release-3.21Brad King2021-07-131-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2114d717a0 Help: Fix preset example cmakeMinimumRequired Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !6333
* | \ \ \ \ \ \ Merge topic 'doc-preset-example-v3'Brad King2021-07-131-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2114d717a0 Help: Fix preset example cmakeMinimumRequired Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !6333
| * | | | | | | Help: Fix preset example cmakeMinimumRequiredSérgio Martins2021-07-121-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 8bc5c8961e (CMakePresets.json: Add the ability to conditionally disable presets, 2021-03-10, v3.21.0-rc1~464^2) the example requires presets version 3 support, which is not available until CMake 3.21. CMake 3.20.0 can't open v3 presets. Make cmakeMinimumRequired compatible with the example's version.
* | | | | | | Merge branch 'release-3.21'Brad King2021-07-130-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'cpack-deb-post-ops' into release-3.21Brad King2021-07-131-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 805fa791d1 CPack/DEB: Avoid overriding user-provided `postinst` and `postrm` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6335
* | \ \ \ \ \ \ Merge topic 'cpack-deb-post-ops'Brad King2021-07-131-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 805fa791d1 CPack/DEB: Avoid overriding user-provided `postinst` and `postrm` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6335
| * | | | | | | CPack/DEB: Avoid overriding user-provided `postinst` and `postrm`Alex Turbov2021-07-121-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user provides `CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA` or `CPACK_DEBIAN_<comp>_PACKAGE_CONTROL_EXTRA` variables in `CMakeLists.txt` and the package contains dynamic libraries, the `CPackDeb.cmake` sets `CPACK_ADD_LDCONFIG_CALL` to `1`. Later it analyzes if defaulted `postinst`/`postrm` should be generated trying to check if the user provides any in `CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA` variable. However, the `foreach` loop uses the invalid variable `PACKAGE_CONTROL_EXTRA` instead, so these files gonna be overridden. Fix the variable name. Fixes: #22410
* | | | | | | Merge branch 'release-3.21'Brad King2021-07-130-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'FindBLAS-LAPACK-All' into release-3.21Brad King2021-07-137-14/+40
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31ac4b9165 ci: Verify that Intel MKL is found when it is the only BLAS/LAPACK 57dcde19da Find{BLAS,LAPACK}: Avoid clobbering results when no vendor is requested Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6336
* | | | | | | Merge topic 'FindBLAS-LAPACK-All'Brad King2021-07-137-14/+40
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31ac4b9165 ci: Verify that Intel MKL is found when it is the only BLAS/LAPACK 57dcde19da Find{BLAS,LAPACK}: Avoid clobbering results when no vendor is requested Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6336
| * | | | | | ci: Verify that Intel MKL is found when it is the only BLAS/LAPACKBrad King2021-07-125-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #22403
| * | | | | | Find{BLAS,LAPACK}: Avoid clobbering results when no vendor is requestedBrad King2021-07-122-4/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logic added by commit 4c74c86f40 (FindBLAS/LAPACK: Add support for the Fujitsu SSL2 library, 2021-01-27, v3.21.0-rc1~402^2~1) accidentally expressed a boolean condition without proper grouping. The pattern was then copied by commit 2c9e623e31 (Find{BLAS,LAPACK}: Add support for the NVHPC LAPACK library, 2021-05-05, v3.21.0-rc1~192^2). The resulting logic incorrectly tries Fujitsu and NVHPC vendors even after results are found from another vendor, and then erases those. Fix the grouping. Fixes: #22403
* | | | | | CMake Nightly Date StampKitware Robot2021-07-131-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'LWYU-externalization'Brad King2021-07-1224-53/+206
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14e57e9637 LINK_WHAT_YOU_USE feature: externalize configuration 9c5132a586 PGI: Fix "LINKER:" prefix generated separator 8a93de080c cmGeneratorTarget: Add method for LINKER: prefix translation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6306
| * | | | | LINK_WHAT_YOU_USE feature: externalize configurationMarc Chevrier2021-07-0921-52/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, this feature is only supported on ELF platforms. So, the property LINK_WHAT_YOU_USE will be ignored for other plateforms. Moreover, flags and commands are now controled by CMake variables. Fixes: #20174
| * | | | | PGI: Fix "LINKER:" prefix generated separatorMarc Chevrier2021-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo from commit 66ea1a3795 (LINK_OPTIONS: Add support of "LINKER:" prefix, 2018-04-30, v3.13.0-rc1~437^2).
| * | | | | cmGeneratorTarget: Add method for LINKER: prefix translationMarc Chevrier2021-07-082-0/+10
| | | | | |
* | | | | | Merge topic 'cpack-rpm-requires-exclude-from'Brad King2021-07-123-0/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb5fc38209 CPack/RPM: Add option to set %global __requires_exclude_from Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6324
| * | | | | | CPack/RPM: Add option to set %global __requires_exclude_fromLisa Welsch2021-07-093-0/+29
| | | | | | |
* | | | | | | Merge topic 'target-stable-order'Brad King2021-07-125-20/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e9ab61e2f cmGlobalGenerator: Process targets in a stable order 8a812dde61 cmGlobalGenerator: Use cmMakefile::CreateNewTarget to add global targets 854dcb0d01 cmMakefile: Split out CreateNewTarget from AddNewTarget Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6267
| * | | | | | | cmGlobalGenerator: Process targets in a stable orderNAKAMURA Takumi2021-07-082-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `cmMakefile::Targets` is meant for efficient lookup but does not have a stable order. Use `cmMakefile::OrderedTargets` instead.
| * | | | | | | cmGlobalGenerator: Use cmMakefile::CreateNewTarget to add global targetsNAKAMURA Takumi2021-07-082-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `cmMakefile::CreateNewTarget` updates also `cmMakefile::OrderedTargets`.
| * | | | | | | cmMakefile: Split out CreateNewTarget from AddNewTargetNAKAMURA Takumi2021-07-082-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CreateNewTarget` tells whether the target is inserted or not.
* | | | | | | | Merge branch 'release-3.21'Brad King2021-07-120-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'release-3.20' into release-3.21Brad King2021-07-120-0/+0
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'release-3.20'Brad King2021-07-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20Brad King2021-07-092-3/+15
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6328
| * \ \ \ \ \ \ \ \ Merge branch 'FindJPEG-revert-turbo' into release-3.20Brad King2021-07-091-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6326
generated by cgit v0.12 at 2025-09-12 22:39:45 (GMT)