summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'CheckPIESUpported-supports-SYSROOT'Brad King2022-01-205-11/+46
|\ | | | | | | | | | | | | | | | | 219dde4ea8 CheckPIESupported: now uses any SYSROOT settings 4fa105d34e Check{Compiler,Linker}Flag: Add possibility to retrieve check outputs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6877
| * CheckPIESupported: now uses any SYSROOT settingsMarc Chevrier2022-01-192-10/+22
| | | | | | | | Fixes: 23053
| * Check{Compiler,Linker}Flag: Add possibility to retrieve check outputsMarc Chevrier2022-01-193-1/+24
| |
* | Merge branch 'release-3.22'Brad King2022-01-200-0/+0
|\ \
| * \ Merge topic 'FortranCInterface-gcc-12-lto' into release-3.22Brad King2022-01-201-0/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 6a0ce19ce1 FortranCInterface: Fix compatibility with GCC gfortran 12 LTO Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6879
* | \ \ Merge topic 'FortranCInterface-gcc-12-lto'Brad King2022-01-201-0/+13
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 6a0ce19ce1 FortranCInterface: Fix compatibility with GCC gfortran 12 LTO Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6879
| * | | FortranCInterface: Fix compatibility with GCC gfortran 12 LTOBjörn Esser2022-01-191-0/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since version 12.0 the GCC Fortran compiler has implemented "WG5/N1942", which causes, if link-time opmization is enabled, obfuscation of hard-coded string values in the compiler objects and its resulting ELF-binaries. This causes the CMake-internal detection of the mangling scheme for the naming of subroutines to fail. Thus we must ensure to have any link-time optimization features to be disabled on the executable file we perform the detection on. The static libraries, however, must be build with LTO and non-LTO objects, as that will ensure the verify step will operate on IPO objects, if building those is requested by the system compiler flags. Fixes: #23123 Signed-off-by: Björn Esser <besser82@fedoraproject.org>
* | | Merge topic 'ccmake-windows'Brad King2022-01-2067-31/+15636
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e674e02c55 Help: Add release note for experimental ccmake support on Windows 5c9310c714 ci: Enable ccmake on Windows 9278c6e01a ccmake: Add Windows support using PDCurses b97c12babb ccmake: Refactor resizing logic into cmCursesForm bf11dab49d ccmake: Refactor BUILD_CursesDialog option logic bf94e01348 cmpdcurses: Add CMake build system 89703bc941 Merge branch 'upstream-PDCurses' into update-pdcurses f84c4112c3 PDCurses 2021-12-08 (f1cd4f45) ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6832
| * | | Help: Add release note for experimental ccmake support on WindowsBrad King2022-01-191-0/+6
| | | |
| * | | ci: Enable ccmake on WindowsBrad King2022-01-191-0/+1
| | | |
| * | | ccmake: Add Windows support using PDCursesDuncan Ogilvie2022-01-185-4/+34
| | | |
| * | | ccmake: Refactor resizing logic into cmCursesFormDuncan Ogilvie2022-01-183-18/+27
| | | |
| * | | ccmake: Refactor BUILD_CursesDialog option logicBrad King2022-01-181-13/+16
| | | | | | | | | | | | | | | | | | | | Move all the current logic behind `if(UNIX)` conditions to make room for other platforms to be added.
| * | | cmpdcurses: Add CMake build systemBrad King2022-01-181-0/+73
| | | |
| * | | Merge branch 'upstream-PDCurses' into update-pdcursesBrad King2022-01-1257-0/+15451
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # By PDCurses Upstream * upstream-PDCurses: PDCurses 2021-12-08 (f1cd4f45)
| | * | | PDCurses 2021-12-08 (f1cd4f45)PDCurses Upstream2022-01-1257-0/+15451
| | / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/wmcbrine/PDCurses.git at commit f1cd4f4569451a5028ddf3d3c202f0ad6b1ae446 (f1cd4f4569451a5028ddf3d3c202f0ad6b1ae446).
| * | | pdcurses: Add script to import PDCurses from upstreamBrad King2022-01-121-0/+32
| | | |
* | | | Merge topic 'cmake-presets-include-outside-project-dir'Brad King2022-01-207-36/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c2d234bc9 CMakePresets: Allow files included from CMakePresets.json to be anywhere Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Gerhard Olsson <gerhard.nospam@gmail.com> Merge-request: !6867
| * | | | CMakePresets: Allow files included from CMakePresets.json to be anywhereKyle Edwards2022-01-197-36/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some valid use cases for allowing these files to be outside the project directory. Relax the restriction, and include a strong warning in the documentation.
* | | | | CMake Nightly Date StampKitware Robot2022-01-201-1/+1
| | | | |
* | | | | Merge topic 'cpack-dmg-sla'Brad King2022-01-1913-3/+95
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e38bfa915 CPack/DMG: Add explicit option to use CPACK_RESOURCE_FILE_LICENSE for SLA 542ba6ac1a Tests: Add CPack/DMG case covering SLA from CPACK_RESOURCE_FILE_LICENSE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6876
| * | | | | CPack/DMG: Add explicit option to use CPACK_RESOURCE_FILE_LICENSE for SLABrad King2022-01-189-3/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since macOS 12.0, the ``hdiutil udifrez`` and ``hdiutil udifderez`` commands to embed and extract resources in a disk image are deprecated. The CPack DragNDrop Generator uses these to attach the SLA specified by the `CPACK_RESOURCE_FILE_LICENSE` option. Since that option is shared by multiple CPack generators, we cannot deprecate it. Instead, add an explicit option to control the behavior. This will give projects a way to package on future macOS versions that remove the commands. In order to provide a long-term transition away from attaching SLAs to disk images, update `cpack` to default this behavior to OFF. To retain compatibility for CMake projects, teach the CPack module to default the option to ON. Later a policy can be added to change the default. Issue: #22978
| * | | | | Tests: Add CPack/DMG case covering SLA from CPACK_RESOURCE_FILE_LICENSEBrad King2022-01-185-0/+31
| | | | | |
* | | | | | Merge topic 'define-property-optional-args'Brad King2022-01-198-46/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edb5059216 define_property(): Make BRIEF_DOCS and FULL_DOCS optional 7d26baff46 cmDefinePropertyCommand: Refactor to use cmArgumentParser Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6875
| * | | | | | define_property(): Make BRIEF_DOCS and FULL_DOCS optionalKyle Edwards2022-01-188-15/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #20698
| * | | | | | cmDefinePropertyCommand: Refactor to use cmArgumentParserKyle Edwards2022-01-181-32/+21
| |/ / / / /
* | | | | | Merge topic 'handle_multiple_source_dirs'Brad King2022-01-192-28/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2bc3364f0 CMake: `-S` paths preferred over other provided paths 2e1b7e5b9a Add tests that showcase cmake -S limitations Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6874
| * | | | | | CMake: `-S` paths preferred over other provided pathsRobert Maynard2022-01-181-28/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cmake parses `cmake -S <path> <path>` treat the second path as the build directory. Likwise when invoked with `<path> -S <path>` treat the first path as the build path instead of using the current working directory.
| * | | | | | Add tests that showcase cmake -S limitationsRobert Maynard2022-01-181-0/+13
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'update-expat'Brad King2022-01-198-20/+215
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d475d1d82 Merge branch 'upstream-expat' into update-expat 1e2684f0aa expat 2022-01-16 (57c7da69) a581fbd195 expat: Update script to get Expat 2.4.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6873
| * \ \ \ \ \ Merge branch 'upstream-expat' into update-expatBrad King2022-01-187-19/+214
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-expat: expat 2022-01-16 (57c7da69)
| | * | | | | | expat 2022-01-16 (57c7da69)Expat Upstream2022-01-187-19/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit 57c7da69b78e3698e112a6b5da19d5109b8232d1 (R_2_4_3).
| * | | | | | | expat: Update script to get Expat 2.4.3Brad King2022-01-181-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'depfile-parsing-update'Brad King2022-01-1911-88/+137
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b65a2b253 add_custom_command(DEPFILE): ensure all dependencies are taken into account e04a352cca Depfile parsing: enhance compatibility with GNU Make Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6861
| * | | | | | add_custom_command(DEPFILE): ensure all dependencies are taken into accountMarc Chevrier2022-01-163-30/+36
| | | | | | |
| * | | | | | Depfile parsing: enhance compatibility with GNU MakeMarc Chevrier2022-01-168-58/+101
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2022-01-191-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'cuda_host_env'Brad King2022-01-183-14/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70f5d9eb49 CUDA: Fix CMAKE_CUDA_COMPILER_ARG1 cache description ad6cd1074b Help: Correct CUDAHOSTCXX and CUDAARCHS as having higher precedence Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6872
| * | | | | | CUDA: Fix CMAKE_CUDA_COMPILER_ARG1 cache descriptionRaul Tambre2022-01-151-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also corrected the misleading indentation.
| * | | | | | Help: Correct CUDAHOSTCXX and CUDAARCHS as having higher precedenceRaul Tambre2022-01-152-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For CUDAHOSTCXX the behaviour seems to have been like this since the introduction of it in commit 9cf5b98d ("CUDA: Prefer environment variables CUDACXX and CUDAHOSTCXX.", 2016-11-08) and is likely unintentional judging by the wording of the commit. The documentation mistake seems to be a copy-paste error from when all the environment variables were documented in commit e6b77c5f ("Help: Document CMake's environment variables", 2017-09-01). Describe this explicitly as it is unlike all other similar environment variables. For CUDAARCHS we got it wrong from the get-go in commit c4ae9384 ("CUDA: Initialize CMAKE_CUDA_ARCHITECTURES using $ENV{CUDAARCHS}", 2020-11-24). Correcting either to follow the more standard precedence behaviour will require a policy. Fixes #23081.
* | | | | | | Merge topic 'doc-internal-linker-preference'Brad King2022-01-183-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2efc90598 Help: Move linker preference variables to the internal section Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6871
| * | | | | | | Help: Move linker preference variables to the internal sectionCraig Scott2022-01-153-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These probably should not have been documented as public variables to begin with. But since they have been documented for a long time, we can't just remove them from the docs. Move them to the internal section instead to make it clearer that they are not intended to be used directly by projects.
* | | | | | | | Merge topic 'CheckLinkerFlag-update-implementation'Brad King2022-01-186-113/+118
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d1b9a4aa1 CheckLinkerFlag: rely now on internal implementation 660e0d80ae internal/CheckCompilerFlag: rely on common configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6860
| * | | | | | | | CheckLinkerFlag: rely now on internal implementationMarc Chevrier2022-01-142-47/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This internal implementation share the configuration with CheckCompilerFlag.
| * | | | | | | | internal/CheckCompilerFlag: rely on common configurationMarc Chevrier2022-01-144-66/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract configuration step from the CheckCompilerFlag command to enable to share it with future CheckLinkerFlag implementation
* | | | | | | | | Merge topic 'find_library-clean-env'Brad King2022-01-183-0/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b916860a48 Tests: Avoid interference from environment in RunCMake.find_library Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6868
| * | | | | | | | | Tests: Avoid interference from environment in RunCMake.find_libraryWilliam R. Dieter2022-01-143-0/+9
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear $ENV{CMAKE_PREFIX_PATH} in several RunCMake.find_library tests because on Windows, a CMAKE_PREFIX_PATH with two consecutive semicolons causes a library to be found when it should not be. None of the updated tests expect CMAKE_PREFIX_PATH from the environment to influence the test, so clear the variable entirely to guarantee it will not affect the test. Fixes: #23111 Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | | | | | | | Merge topic 'add-intel-copyright'Brad King2022-01-181-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34fcc6b586 Add Intel to the Copyright.txt file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6869
| * | | | | | | | | Add Intel to the Copyright.txt fileWilliam R. Dieter2022-01-141-0/+1
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | | | | | | | Merge topic 'IntelLLVM-windows-link-with-driver'Brad King2022-01-181-0/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79921fb00c IntelLLVM: Set linker to compiler driver for Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6866