summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* find_package: Add variable to make package REQUIREDEugene Shalygin2021-07-0815-6/+99
| | | | | | | | | | | | | | Add a `CMAKE_REQUIRE_FIND_PACKAGE_<PackageName>` variable is complement to `CMAKE_DISABLE_FIND_PACKAGE_<PackageName>` with just the opposite behaviour: it turns non-required find_package call into the required one. While optional package dependencies usually result in simple and clean build logic, sometimes people want to be sure those optional dependencies will be found and used. Examples are reproducible builds and build instructions for 3rd parties. People choose to make find_package calls REQUIRED and put them behind an option(). Such workarounds blend build logic with build environment management and do not look elegant.
* Merge topic 'FindPkgConfig-pkgconf'Brad King2021-07-071-0/+1
|\ | | | | | | | | | | | | | | 94a84dc0af FindPkgConfig: add pkgconf to the search list. Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6301
| * FindPkgConfig: add pkgconf to the search list.Alexander Neumann2021-07-021-0/+1
| |
* | Merge topic 'FindGLUT-pkg-config'Brad King2021-07-078-69/+135
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | f90d15458a FindGLUT: Use pkg-config to find flags if available f3f0401187 FindGLUT: Reduce if/else nesting and indentation bece79f9be Tests: Add case covering FindGLUT variables and imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6251
| * | FindGLUT: Use pkg-config to find flags if availableChristopher Degawa2021-07-021-1/+35
| | | | | | | | | | | | | | | | | | | | | FindGLUT fails to properly link a static libglut as it does not list the dependencies needed. Signed-off-by: Christopher Degawa <ccom@randomderp.com>
| * | FindGLUT: Reduce if/else nesting and indentationChristopher Degawa2021-07-021-68/+59
| | | | | | | | | | | | Signed-off-by: Christopher Degawa <ccom@randomderp.com>
| * | Tests: Add case covering FindGLUT variables and imported targetsChristopher Degawa2021-07-027-0/+41
| |/ | | | | | | Signed-off-by: Christopher Degawa <ccom@randomderp.com>
* | Merge branch 'release-3.21'Brad King2021-07-070-0/+0
|\ \
| * \ Merge topic 'help_cxxstd' into release-3.21Brad King2021-07-071-1/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 5650bebc2f Help: Note CXX_STANDARD values added vs. CMake version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6305
* | \ \ Merge topic 'help_cxxstd'Brad King2021-07-071-1/+25
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 5650bebc2f Help: Note CXX_STANDARD values added vs. CMake version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6305
| * | | Help: Note CXX_STANDARD values added vs. CMake versionMichael Hirsch2021-07-061-1/+25
| | | |
* | | | Merge branch 'release-3.21'Brad King2021-07-070-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'correct_cuda_toolkit_version_typo' into release-3.21Brad King2021-07-071-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d54276c82 Correct CUDAToolkit_VERSION_MINOR variable name typo Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6311
* | \ \ \ Merge topic 'correct_cuda_toolkit_version_typo'Brad King2021-07-071-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d54276c82 Correct CUDAToolkit_VERSION_MINOR variable name typo Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6311
| * | | | Correct CUDAToolkit_VERSION_MINOR variable name typoRobert Maynard2021-07-061-1/+1
| | | | |
* | | | | Merge branch 'release-3.21'Brad King2021-07-070-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'cmake-presets-list-no-generator' into release-3.21Brad King2021-07-076-13/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9a3c9fad5 CMakePresets.json: Make --list-presets show presets with no generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6314
* | \ \ \ \ Merge topic 'cmake-presets-list-no-generator'Brad King2021-07-076-13/+23
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d9a3c9fad5 CMakePresets.json: Make --list-presets show presets with no generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6314
| * | | | | CMakePresets.json: Make --list-presets show presets with no generatorKyle Edwards2021-07-066-13/+23
| | |_|/ / | |/| | | | | | | | | | | | | Fixes: #22389
* | | | | Merge branch 'release-3.21'Brad King2021-07-070-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'xcode13-old-buildsystem' into release-3.21Brad King2021-07-071-1/+5
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 71a2664ebb Xcode: Ignore deprecated build system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6309
* | | | | Merge topic 'xcode13-old-buildsystem'Brad King2021-07-071-1/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 71a2664ebb Xcode: Ignore deprecated build system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6309
| * | | | Xcode: Ignore deprecated build systemGregor Jasny2021-07-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | With Xcode 13 the key to suppress the check has changed. Tested with Xcode 12.5 and 13.0-beta2.
* | | | | CMake Nightly Date StampKitware Robot2021-07-071-1/+1
| | | | |
* | | | | Merge branch 'release-3.21'Brad King2021-07-060-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-3.20' into release-3.21Brad King2021-07-060-0/+0
| |\ \ \ \
* | \ \ \ \ Merge branch 'release-3.20'Brad King2021-07-060-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'backport-3.20-makefile-normalize-depfile' into release-3.20Brad King2021-07-023-6/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !6297
* | \ \ \ \ \ Merge branch 'release-3.21'Brad King2021-07-060-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'makefile-normalize-depfile' into release-3.21Brad King2021-07-063-6/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6bc6ffb9a9 Merge branch 'backport-3.20-makefile-normalize-depfile' 6a6efdcaed Makefiles: Normalize compiler-generated depfile paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6297
* | \ \ \ \ \ \ Merge topic 'makefile-normalize-depfile'Brad King2021-07-063-6/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30926620bb Merge branch 'backport-3.21-makefile-normalize-depfile' 6bc6ffb9a9 Merge branch 'backport-3.20-makefile-normalize-depfile' 6a6efdcaed Makefiles: Normalize compiler-generated depfile paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6297
| * \ \ \ \ \ \ \ Merge branch 'backport-3.21-makefile-normalize-depfile'Brad King2021-07-0212-18/+71
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'backport-3.20-makefile-normalize-depfile'Brad King2021-07-023-6/+17
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Makefiles: Normalize compiler-generated depfile pathsMarc Chevrier2021-07-023-6/+17
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though Makefile generators pass source files and include directories by absolute path to the compiler, the compiler may generate depfile paths relative to the current working directory. For example, `ccache` with `CCACHE_BASEDIR` may transform paths this way. When reading a depfile, convert relative dependencies to absolute paths before placing them in `compiler_depend.make`, which is later evaluated in the top-level build directory. Fixes: #22364
* | | | | | | | Merge branch 'release-3.21'Brad King2021-07-060-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge topic 'ci-fixups' into release-3.21Brad King2021-07-0622-28/+49
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46c89c77de gitlab-ci: Rename CI config variable to avoid conflict with CMAKE_BUILD_TYPE 3ede66e17a Tests: Fix newline matching in several RunCMake.* cases Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6298
* | | | | | | | Merge topic 'ci-fixups'Brad King2021-07-0622-28/+49
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46c89c77de gitlab-ci: Rename CI config variable to avoid conflict with CMAKE_BUILD_TYPE 3ede66e17a Tests: Fix newline matching in several RunCMake.* cases Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6298
| * | | | | | | gitlab-ci: Rename CI config variable to avoid conflict with CMAKE_BUILD_TYPEBrad King2021-07-024-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e216b9bbd3 (cmake: Allow CMAKE_BUILD_TYPE to be set by environment variable, 2021-06-29), the `CMAKE_BUILD_TYPE` environment variable is interpreted by CMake, and can affect the test suite. Rename our CI config variable to avoid conflict.
| * | | | | | | Tests: Fix newline matching in several RunCMake.* casesBrad King2021-07-0218-21/+42
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RunCMake infrastructure's `*-stdout.txt` expected output files interpret `\n` as a `\` and `n` rather than a newline. Use a literal newline instead. Otherwise the cases that were trying to match any configuration name via `[^\n]*` would fail on `RelWithDebInfo` because it contains the letter `n`.
* | | | | | | CMake Nightly Date StampKitware Robot2021-07-061-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.21'Craig Scott2021-07-060-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'doc-3.21-release' into release-3.21Craig Scott2021-07-062-61/+75
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24b76eaa93 Help: Improve readability and accuracy of runtime deps-related content 308e5b30c9 Help: Tighten install(SCRIPT) wording for ALL_COMPONENTS option 52dec01729 Help: Add missing versionadded 3.21 for file(RENAME) options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6302
* | | | | | | Merge topic 'doc-3.21-release'Craig Scott2021-07-062-61/+75
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24b76eaa93 Help: Improve readability and accuracy of runtime deps-related content 308e5b30c9 Help: Tighten install(SCRIPT) wording for ALL_COMPONENTS option 52dec01729 Help: Add missing versionadded 3.21 for file(RENAME) options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6302
| * | | | | | Help: Improve readability and accuracy of runtime deps-related contentCraig Scott2021-07-042-55/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Duplicated textual patterns are factored out to make the text more readable. The POST_INCLUDE_FILES and POST_EXCLUDE_FILES were also previously missing from the main syntax block for install(RUNTIME_DEPENDENCY_SET).
| * | | | | | Help: Tighten install(SCRIPT) wording for ALL_COMPONENTS optionCraig Scott2021-07-031-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, mention the mutually exclusive nature with the COMPONENT option. Fix the inconsistent way the versionadded details were added for that text too.
| * | | | | | Help: Add missing versionadded 3.21 for file(RENAME) optionsCraig Scott2021-07-031-0/+4
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2021-07-051-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-07-041-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-07-031-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'ctest_not_dart'Brad King2021-07-0213-174/+175
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0962cbf21d help: update ctest attached file example 5489ce74b3 ctest: support <CTestMeasurement> for runtime measurements 7817aa6fa4 ctest: improve test for runtime labels Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6296
generated by cgit v0.12 at 2025-02-21 23:06:28 (GMT)