summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Source: Fix clang -Wimplicit-fallthrough warningsSean McBride2021-09-2827-22/+67
|
* Source: Fix clang -Wextra-semi warningsSean McBride2021-09-2814-22/+30
|
* Merge topic 'irsl-intel-variants'Brad King2021-09-241-0/+4
|\ | | | | | | | | | | | | 956160bb9a IRSL: Fix search for Windows redist files with Intel Classic compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6557
| * IRSL: Fix search for Windows redist files with Intel Classic compilerBrad King2021-09-231-0/+4
| | | | | | | | | | | | | | | | The oneAPI icx/ifx compilers are under `.../windows/bin`. The classic icl/ifort compilers are under `.../windows/bin/intel64`. Add paths to the redist directory relative to both locations. Fixes: #22673
* | Merge topic 'mpi-cross'Brad King2021-09-241-1/+35
|\ \ | | | | | | | | | | | | | | | | | | 0723b2c935 MPI: Add fallback detection code for MPI when cross compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6537
| * | MPI: Add fallback detection code for MPI when cross compilingHelmut Grohne2021-09-171-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MPI libraries use a compiler wrapper to automatically inject required flags and libraries into the compiler argument list. However, the wrapper does not support cross-compiling: the wrapper will try to invoke the native compiler which cannot handle the cross architecture MPI libraries and fail. This MR adds some fallback code for this case, which tries to bypass the faulty wrapper and determine the necessary flags and libraries directly from the MPI pkg-config files. The patch tries to be as unintrusive as possible and should not break any existing use-cases. Fixes: #22650
* | | Merge branch 'release-3.21'Brad King2021-09-240-0/+0
|\ \ \
| * \ \ Merge topic 'FindMatlab-r2021b' into release-3.21Brad King2021-09-241-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a013404f43 FindMatlab: Add R2021b => 9.11 version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6556
* | \ \ \ Merge topic 'FindMatlab-r2021b'Brad King2021-09-241-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | a013404f43 FindMatlab: Add R2021b => 9.11 version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6556
| * | | | FindMatlab: Add R2021b => 9.11 versionMichael Hirsch2021-09-231-0/+1
| |/ / / | | | | | | | | | | | | R2021b released 09/22/2021.
* | | | CMake Nightly Date StampKitware Robot2021-09-241-1/+1
| |_|/ |/| |
* | | Merge topic 'iar-asm-deduplication'Brad King2021-09-232-58/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b1727b8a7e IAR: ASM module code deduplication Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6553
| * | | IAR: ASM module code deduplicationFelipe Torrezan2021-09-232-58/+30
| | | |
* | | | Merge topic 'vs2008-no-pch-flag'Brad King2021-09-233-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2b782bbc1 VS: Map /Y- flag to not use precompiled headers with VS 2008 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6548
| * | | | VS: Map /Y- flag to not use precompiled headers with VS 2008Luigi Fiorentini2021-09-223-0/+3
| | | | |
* | | | | Merge topic 'matlab_versions_natural_sort'Brad King2021-09-231-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f43ba5073 FindMatlab: Sort available Matlab versions using natural comparison. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6555
| * | | | | FindMatlab: Sort available Matlab versions using natural comparison.Vincent Newsum2021-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, when FindMatlab.cmake searches the registry for installed Matlab versions, it sorts these versions alphabetically. Since Matlab 2021a (version 9.10) came out this became a problem as now version 9.10 is placed after 9.1 instead of after a higher version less than 9.10. The result is that FindMatlab doesn't return the highest version by default. This fix uses the natural sort comparison which was introduced in CMake 3.18.
* | | | | | Merge topic 'iar-rl78-xlink'Brad King2021-09-232-4/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8954f93543 IAR: emit fatal message for RL78 XLINK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6552
| * | | | | | IAR: emit fatal message for RL78 XLINKFelipe Torrezan2021-09-212-4/+12
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'iar-riscv-binutils'Brad King2021-09-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c3684b356 IAR: fix assembler detection for RISC-V Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6551
| * | | | | | IAR: fix assembler detection for RISC-VFelipe Torrezan2021-09-211-1/+1
| |/ / / / /
* | | | | | Merge topic 'IAR-executable-suffix'Brad King2021-09-231-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9254e7ddf2 IAR: Use same executable suffix as try_compile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6546
| * | | | | | IAR: Use same executable suffix as try_compileRainer Keller2021-09-211-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a mismatch in the executable suffix between the compiler detection and try_compile. This resulted in the generated executable having a different suffix than what try_compile was looking for. The IAR module is changed to use the same suffix as try_compile. Fixes: #22567
* | | | | | CMake Nightly Date StampKitware Robot2021-09-231-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'rename-cmProp-in-cmValue'Brad King2021-09-22199-1817/+1870
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59ad7a1c24 Move helpers functions from cmStringAlgorithms.h to cmValue.h edf67dd039 cmValue: add IsInternallyOn methods cc56dc7468 Rename cmProp in cmValue Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6554
| * | | | | Move helpers functions from cmStringAlgorithms.h to cmValue.hMarc Chevrier2021-09-2116-83/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Helpers functions related to cmValue semantic are now part of cmValue.h header.
| * | | | | cmValue: add IsInternallyOn methodsMarc Chevrier2021-09-214-18/+38
| | | | | |
| * | | | | Rename cmProp in cmValueMarc Chevrier2021-09-21188-1734/+1762
| | | | | |
* | | | | | Merge topic 'doc-build-config'Craig Scott2021-09-223-68/+140
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8d10c27d1 Help: Restructure build type docs and clarify case sensitivity Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6516
| * | | | | Help: Restructure build type docs and clarify case sensitivityCraig Scott2021-09-213-68/+140
| | | | | | | | | | | | | | | | | | Fixes: #22591
* | | | | | CMake Nightly Date StampKitware Robot2021-09-221-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'macos-cache-rpath-install-namedir'Brad King2021-09-212-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2266e223c5 macOS: Speed up rpath install name dir lookup with a cache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6543
| * | | | | macOS: Speed up rpath install name dir lookup with a cacheLukas Böger2021-09-202-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20602
* | | | | | Merge topic 'cat_empty_file'Brad King2021-09-212-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4a56e64b cmake: -E cat stops when an empty file is encountered Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6539
| * | | | | | cmake: -E cat stops when an empty file is encounteredJohnny Jazeix2021-09-182-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22652
* | | | | | | Merge topic 'tests-cpack-deb-non-linux'Brad King2021-09-211-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b07812c6de Tests: fix RunCMake.CPack_DEB.EXTRA on Debian non-Linux OSes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6540
| * | | | | | | Tests: fix RunCMake.CPack_DEB.EXTRA on Debian non-Linux OSesPino Toscano2021-09-181-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generated path with the packages uses $CPACK_TOPLEVEL_TAG, which by default is $CPACK_SYSTEM_NAME, thus the OS name. To make the expected stderr match also non-Linux OSes, accept any non-slash characters in place of "Linux", so it works also on other Debian OSes (e.g. Debian/Hurd).
* | | | | | | Merge topic 'refactor-remove-cmToCStr-function'Brad King2021-09-2117-42/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a1e6f5f59 remove cmToCStr function dffa3f485c cmGlobalGenerator::PrintCompilerAdvice: use cmProp as augment 062432a6bc cmCurlSetCAInfo: use std::string as argument Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6544
| * | | | | | | remove cmToCStr functionMarc Chevrier2021-09-196-26/+16
| | | | | | | |
| * | | | | | | cmGlobalGenerator::PrintCompilerAdvice: use cmProp as augmentMarc Chevrier2021-09-198-10/+11
| | | | | | | |
| * | | | | | | cmCurlSetCAInfo: use std::string as argumentMarc Chevrier2021-09-194-6/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'clang-manifest'Brad King2021-09-214-7/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b73857561f Clang: embed windows manifests with GNU interface Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6534
| * | | | | | | Clang: embed windows manifests with GNU interfaceThomas Bernard2021-09-164-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solves: #22611
* | | | | | | | Merge topic 'platform-vars'Brad King2021-09-218-87/+33
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a136b6ec98 MINGW: Define variable only when targeting Windows platforms 39c5dad0cb Ninja: Remove redundant check for GNU-like compiler on Windows 0b7ae84a96 Cygwin: Remove redundant definitions of CYGWIN and UNIX variables Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6538
| * | | | | | | MINGW: Define variable only when targeting Windows platformsBrad King2021-09-177-45/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `MINGW` variable indicates that the compiler targets MinGW, a GNU ABI on Windows. Since commit aff3147917 (Modernize GNU compiler info on Windows, 2009-12-02, v2.8.2~636), we load the `Platform/Windows-GNU` module for compilers targetin MinGW, so set the variable there instead. This is equivalent to `Platform/Windows-MSVC` setting the `MSVC` variable. Also remove `if(MINGW)` checks from the module, which have not been necessary since the enclosed logic was moved to that module. The undocumented `CMAKE_COMPILER_IS_MINGW` internal variable is now unused, so remove it too. Fixes: #22647
| * | | | | | | Ninja: Remove redundant check for GNU-like compiler on WindowsBrad King2021-09-171-21/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the Ninja generator's check to work using whatever language is being enabled instead of hard-coding C and CXX. With that, the undocumented internal `CMAKE_COMPILER_IS_MINGW` variable is only set by compilers already covered by other alternatives in the condition. See commit b3de0dfe93 (Ninja: Use forward slashes for any GCC on Windows, 2015-05-07, v3.3.0-rc1~93^2~3).
| * | | | | | | Cygwin: Remove redundant definitions of CYGWIN and UNIX variablesBrad King2021-09-166-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are set by modules loaded for `CMAKE_SYSTEM_NAME`. We do not need to set them again if the compiler defines `__CYGWIN__`. Also remove the now-unused undocumented `CMAKE_COMPILER_IS_CYGWIN` internal variable.
* | | | | | | | CMake Nightly Date StampKitware Robot2021-09-211-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.21'Brad King2021-09-200-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | CMake 3.21.3v3.21.3Brad King2021-09-201-1/+1
| | | | | | | |