summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'find_package-required-var'Brad King2021-07-0815-6/+99
|\ | | | | | | | | | | | | | | a2e9fe38e4 find_package: Add variable to make package REQUIRED Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Hirsch <michael@scivision.dev> Merge-request: !6316
| * 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 'FindMPI-adjust-compile-definitions-early'Brad King2021-07-081-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 0c1b9b3516 FindMPI: Choose definitions for MPI_CXX_SKIP_MPICXX before first use Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6303
| * | FindMPI: Choose definitions for MPI_CXX_SKIP_MPICXX before first useYe Luo2021-07-071-1/+1
| | | | | | | | | | | | Fixes: #22391
* | | Merge topic 'cpack-nsis_update-languange-list'Brad King2021-07-081-0/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9ce235fe5d CPack/NSIS: Update language list in template Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6310
| * | | CPack/NSIS: Update language list in templateMarc Ruiz2021-07-071-0/+13
| | | | | | | | | | | | | | | | Fixes: #22382
* | | | Merge topic 'CPATH_symlinks'Brad King2021-07-082-12/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c00f928ce1 Do not exclude include directory symlinks to entries of CPATH 5c02964aff cmLocalGenerator: Simplify CPATH lookup loop 86595b3002 cmLocalGenerator: Clarify check for membership in multiple sets 10969fd003 cmLocalGenerator: Remove unnecessary parentheses in a condition 3fd56472c6 cmLocalGenerator: Store realpath lookup result in a variable 429fb28f25 cmLocalGenerator: Factor out repeated condition into local variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6313
| * | | | Do not exclude include directory symlinks to entries of CPATHAlexander Grund2021-07-072-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix from commit 2d0b0e2b9d (Do not exclude include directories made implicit by CPATH, 2019-05-29, v3.14.5~2^2) to cover include directories that are symlinks to paths listed in `CPATH`. Compare resolved paths against resolved entries of `CPATH`. Resolve the entries as late as possible in case symlinks change. Fixes: #22383
| * | | | cmLocalGenerator: Simplify CPATH lookup loopAlexander Grund2021-07-071-3/+2
| | | | |
| * | | | cmLocalGenerator: Clarify check for membership in multiple setsAlexander Grund2021-07-071-3/+3
| | | | |
| * | | | cmLocalGenerator: Remove unnecessary parentheses in a conditionAlexander Grund2021-07-071-4/+4
| | | | |
| * | | | cmLocalGenerator: Store realpath lookup result in a variableAlexander Grund2021-07-071-2/+3
| | | | |
| * | | | cmLocalGenerator: Factor out repeated condition into local variableAlexander Grund2021-07-061-3/+4
| | | | |
* | | | | Merge branch 'release-3.21'Brad King2021-07-080-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'FindCUDAToolkit-doc-version' into release-3.21Brad King2021-07-081-3/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 266fc8ada5 FindCUDAToolkit: Properly document the version support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6320
* | \ \ \ \ \ Merge topic 'FindCUDAToolkit-doc-version'Brad King2021-07-081-3/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 266fc8ada5 FindCUDAToolkit: Properly document the version support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6320
| * | | | | | FindCUDAToolkit: Properly document the version supportRobert Maynard2021-07-071-3/+8
| | | | | | |
* | | | | | | Merge branch 'release-3.21'Brad King2021-07-080-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.20' into release-3.21Brad King2021-07-080-0/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'release-3.20'Brad King2021-07-080-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'release-3.19' into release-3.20Brad King2021-07-080-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'check_cxx_compiler_flag_no_normal_variable' into release-3.20Brad King2021-07-082-1/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6318
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.19'Brad King2021-07-080-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'check_cxx_compiler_flag_no_normal_variable' into release-3.19Brad King2021-07-082-1/+10
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | Merge-request: !6318
* | | | | | | | | | Merge branch 'release-3.21'Brad King2021-07-080-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'check_cxx_compiler_flag_no_normal_variable' into release-3.21Brad King2021-07-082-1/+10
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 018d300ca0 Check*CompilerFlag: Do not set result as a normal variable too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6318
* | | | | | | | | | Merge topic 'check_cxx_compiler_flag_no_normal_variable'Brad King2021-07-082-1/+10
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 018d300ca0 Check*CompilerFlag: Do not set result as a normal variable too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6318
| * | | | | | | | | Check*CompilerFlag: Do not set result as a normal variable tooRobert Maynard2021-07-082-1/+10
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously fixed by commit d46590910c (Check*CompilerFlag: Do not set result as a normal variable too, 2020-09-21, v3.18.3~1^2^2), but was regressed by refactoring in commit 90dead024c (CheckCompilerFlag: unified way to check compiler flags per language, 2020-09-25, v3.19.0-rc1~88^2) due to the changes being developed concurrently. Fix it again, and add a test case. Fixes: #21207
* | | | | | | | | Merge branch 'release-3.21'Brad King2021-07-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'release-3.20' into release-3.21Brad King2021-07-080-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'release-3.20'Brad King2021-07-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20Brad King2021-07-072-12/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6319
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2021-07-080-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'intel-oneapi-std-windows' into release-3.21Brad King2021-07-082-10/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13961f3b43 Merge branch 'backport-3.20-intel-oneapi-std-windows' 5115dd1e2c IntelLLVM: Fix C/C++ standard level flags on Windows 84036d30d4 IntelLLVM: Fix C/C++ standard level flags on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6319
* | \ \ \ \ \ \ \ \ \ Merge topic 'intel-oneapi-std-windows'Brad King2021-07-082-10/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13961f3b43 Merge branch 'backport-3.20-intel-oneapi-std-windows' 5115dd1e2c IntelLLVM: Fix C/C++ standard level flags on Windows 84036d30d4 IntelLLVM: Fix C/C++ standard level flags on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6319
| * | | | | | | | | | Merge branch 'backport-3.20-intel-oneapi-std-windows'Brad King2021-07-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | IntelLLVM: Fix C/C++ standard level flags on WindowsBrad King2021-07-072-12/+4
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based compilers, 2020-11-02, v3.20.0-rc1~89^2~20) we accidentally left out activation of the C/C++ standard level selection logic when IntelLLVM is targeting the MSVC ABI. Fixes: #22388
| * | | | | | | | | IntelLLVM: Fix C/C++ standard level flags on WindowsBrad King2021-07-072-10/+2
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based compilers, 2020-11-02, v3.20.0-rc1~89^2~20) we accidentally left out activation of the C/C++ standard level selection logic when IntelLLVM is targeting the MSVC ABI. Fixes: #22388
* | | | | | | | | CMake Nightly Date StampKitware Robot2021-07-081-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'FindMPI-option-MPI_CXX_SKIP_MPICXX'Brad King2021-07-071-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a9ebd1694 FindMPI: Honor MPI_CXX_SKIP_MPICXX when set as a normal variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6315
| * | | | | | | | | FindMPI: Honor MPI_CXX_SKIP_MPICXX when set as a normal variableBrad King2021-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Express the cache entry with `option()`. In combination with policies CMP0077 and CMP0102, this allows project code to control the switch with a variable: ``` set(MPI_CXX_SKIP_MPICXX TRUE) find_package(MPI COMPONENTS CXX) ```
* | | | | | | | | | Merge topic 'ifort_win32_log'Brad King2021-07-071-2/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0602e35858 Intel/Fortran: Avoid recording warning 5117 lines in CMakeError.log Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6308
| * | | | | | | | | Intel/Fortran: Avoid recording warning 5117 lines in CMakeError.logMichael Hirsch2021-07-061-2/+5
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
generated by cgit v0.12 at 2025-03-02 21:11:37 (GMT)