summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.20.0-rc5v3.20.0-rc5Brad King2021-03-171-1/+1
|
* Merge branch 'release-3.19' into release-3.20Brad King2021-03-170-0/+0
|\
| * Merge branch 'backport-3.19-ci-vs-16.8-in-16.9' into release-3.19Brad King2021-03-172-4/+4
| |\ | | | | | | | | | Merge-request: !5918
| * \ Merge branch 'ninja-regenerate-no-recompact' into release-3.19Brad King2021-03-161-2/+3
| |\ \ | | | | | | | | | | | | Merge-request: !5916
| * \ \ Merge branch 'FindPkgConfig-NAMES_PER_DIR' into release-3.19Brad King2021-03-161-1/+4
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !5914
* | \ \ \ Merge topic 'ninja-regenerate-no-recompact' into release-3.20Brad King2021-03-171-2/+3
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fd9c68ed0 Ninja: Do not recompact deps log in regeneration during a build Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5916
| * | | | Ninja: Do not recompact deps log in regeneration during a buildBrad King2021-03-161-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit fb18215904 (Ninja: clean ninja metadata once generated, 2019-05-13, v3.17.0-rc1~207^2) we recompact the ninja deps log during regeneration. That does not make sense during a build, so skip it if we are regenerating during a build. This problem went unnoticed previously because on non-Windows platforms the deps log is just overwritten again by the outer build. On Windows platforms, recompaction during the build fails, but we did not actually try to do that until commit 11f4259362 (Ninja: Clean metadata after regen during build on Windows with 1.10.2+, 2020-11-30, v3.19.2~29^2~1). Fixes: #21916
* | | | Merge topic 'FindPkgConfig-NAMES_PER_DIR' into release-3.20Brad King2021-03-171-1/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | c7bd2d0d97 FindPkgConfig: Restore preference for first pkg-config in PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5914
| * | | FindPkgConfig: Restore preference for first pkg-config in PATHBrad King2021-03-161-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit ab8bd48352 (FindPkgConfig: Search for pkg-config.bat file on a Windows host, 2020-09-25, v3.19.0-rc1~98^2) we prefer `pkg-config.bat` over `pkg-config` regardless of the order they appear in the `PATH`. Tell `find_program` to consider all names in each directory so that the first one in `PATH` of any name wins. Issue: #21239
* | | Merge branch 'ci-vs-16.8-in-16.9' into release-3.20Brad King2021-03-170-0/+0
|\ \ \
| * \ \ Merge branch 'backport-3.19-ci-vs-16.8-in-16.9' into ci-vs-16.8-in-16.9Brad King2021-03-170-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | gitlab-ci: Fix using VS 16.8 toolset under VS 16.9 in CMake 3.19 branchBrad King2021-03-172-4/+4
| | |/ | | | | | | | | | | | | | | | The 16.8 and 16.9 toolset numbers vary only in their third component. Use CMake 3.19.7 for three-component toolset version specification support.
* | | Merge branch 'invalid-configure-preset' into release-3.20Brad King2021-03-1718-14/+62
|\ \ \ | | | | | | | | | | | | Merge-request: !5912
| * | | Tests: update tests to catch invalid configurePreset at read-timeSam Freed2021-03-1516-10/+49
| | | |
| * | | Fail at read-time if configurePreset field invalidSam Freed2021-03-152-4/+13
| | | |
* | | | Merge topic 'FindOpenMP-IntelLLVM-Windows' into release-3.20Brad King2021-03-171-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fd014a4b6 FindOpenMP: Use -Qiopenmp instead of -fiopenmp for IntelLLVM on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5904
| * | | | FindOpenMP: Use -Qiopenmp instead of -fiopenmp for IntelLLVM on WindowsWilliam R. Dieter2021-03-151-1/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Windows driver does not like the `-f` form of this option. Note that we prefer `-Qiopenmp/-fiopenmp` over `-Qopenmp/-fopenmp` in order to generate LLVM IR with parallelization information, which the backend uses to generate parallelized code. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | | Merge topic 'FindMatlab-r2021a' into release-3.20Brad King2021-03-161-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 427f5f2fa9 FindMatlab: R2021a version map Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5907
| * | | FindMatlab: R2021a version mapMichael Hirsch2021-03-151-0/+1
| | | |
* | | | Merge topic 'ci-vs-16.8-in-16.9' into release-3.20Brad King2021-03-152-4/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5910
| * | | gitlab-ci: Fix using VS 16.8 toolset under VS 16.9Brad King2021-03-152-4/+4
|/ / / | | | | | | | | | | | | | | | The 16.8 and 16.9 toolset numbers vary only in their third component. Use CMake 3.19.7 for three-component toolset version specification support.
* | | Merge branch 'release-3.19' into release-3.20Brad King2021-03-150-0/+0
|\ \ \ | | |/ | |/|
| * | CMake 3.19.7v3.19.7Brad King2021-03-151-1/+1
| | |
* | | Merge branch 'release-3.19' into release-3.20Brad King2021-03-150-0/+0
|\ \ \ | |/ /
| * | Merge branch 'vs-toolset-version' into release-3.19Brad King2021-03-127-96/+170
| |\ \ | | | | | | | | | | | | Merge-request: !5903
* | \ \ Merge topic 'vs-toolset-version' into release-3.20Brad King2021-03-157-96/+170
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | | | | | | | 30c835428f VS: Accept and translate '-T version=' values with three components 58a50a3a0a VS: Fix '-T version=14.28' under VS 16.9 09f59da7f0 cmGlobalVisualStudioVersionedGenerator: Clarify local variable name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5903
| * | VS: Accept and translate '-T version=' values with three componentsBrad King2021-03-123-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | The VS 16.8 and VS 16.9 toolset versions differ only in their third component. The `vcvarsall` option `-vcvars_ver=` accepts a three component version, so accept this format for VS toolset selection too. Issue: #21922
| * | VS: Fix '-T version=14.28' under VS 16.9Brad King2021-03-126-91/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake accepts the toolset version that is default in the current VS version by matching the name later VS versions will use for the SxS props files. It predicts the future name based on the first two components of the current VS version's default toolset. However, this heuristic breaks naming the VS 16.8 toolset version 14.28 under VS 16.9 because the latter's default toolset version is 14.28.29910, which did not increment the second version component (unprecedented in VS). Fix this by always using the requested version's SxS props file when it exists, even if it matches the first two components of the current VS version's default toolset. Also add a special case for the name VS 16.10 will use for VS 16.9's default toolset, so that it can be used with VS 16.9 too. Fixes: #21922
| * | cmGlobalVisualStudioVersionedGenerator: Clarify local variable nameBrad King2021-03-121-5/+5
| |/
* | Merge topic 'ci-build-no-doc' into release-3.20Brad King2021-03-121-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | 9b5eae9cde gitlab-ci: remove redundant sphinx build from release-style CI jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5905
| * | gitlab-ci: remove redundant sphinx build from release-style CI jobsBrad King2021-03-121-1/+2
|/ / | | | | | | | | | | The Sphinx build is mostly serial and takes a long time. All our CI pipelines (packaging, integration branches, merge requests) have a dedicated job for the Sphinx build.
* | CMake 3.20.0-rc4v3.20.0-rc4Brad King2021-03-111-1/+1
| |
* | Merge branch 'release-3.19' into release-3.20Brad King2021-03-110-0/+0
|\ \ | |/
| * Merge branch 'cray-compiler-wrapper-detection' into release-3.19Brad King2021-03-103-5/+5
| |\ | | | | | | | | | Merge-request: !5897
| * \ Merge branch 'backport-xcode-framework-quoting' into release-3.19Brad King2021-03-104-1/+26
| |\ \ | | | | | | | | | | | | Merge-request: !5899
* | \ \ Merge topic 'xcode-framework-quoting' into release-3.20Brad King2021-03-114-1/+26
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4f9a71974e Xcode: Restore support for spaces in framework names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5899
| * | | Xcode: Restore support for spaces in framework namesBrad King2021-03-104-1/+26
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit ce2dee9e5b (Xcode: Don't add framework as -framework argument in linker info list, 2020-09-28, v3.19.0-rc1~47^2) we split up the path to a framework into the directory and framework name parts, but only retained the quoting on the directory part. Restore quoting of the framework name. Fixes: #21910
* | | Merge topic 'cray-compiler-wrapper-detection' into release-3.20Brad King2021-03-113-5/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5897
| * | Cray: Enable Cray compiler wrapper detection on all platformsJustin LaPolla2021-03-103-5/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Previously were checking for the `__CRAYXC` and `__CRAYXE` predefined macros. These macros reflect the platform that the compiler wrapper is running on, i.e. Cray XC and Cray XE machines. They are not defined on other platforms such as Apollo80. Switch to the `__CRAYXT_COMPUTE_LINUX_TARGET` macro. The Cray cc/CC/ftn wrappers always define this macro on the command line. This macro has been in use for many years, and is believed to be a reliable way to detect current and older Cray compiler wrappers. Fixes: #21904
* | Merge topic 'ep-fc-revert-refactoring' into release-3.20Brad King2021-03-1035-1911/+1112
|\ \ | | | | | | | | | | | | | | | | | | 57d442e182 Revert ExternalProject and FetchContent refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5898
| * | Revert ExternalProject and FetchContent refactoringCraig Scott2021-03-1035-1911/+1112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring of the ExternalProject and FetchContent modules moved the commands into CMake scripts. This broke custom commands that used shell redirection or special build tool variables of the form $(MakeVar). Undo the sequence of commits that performed this refactoring and follow-up fixes associated with it. The following commits are reverted by this change: 4f3d1abbb4 (ExternalProject: Refactor pre-configure steps to support no-target uses, 2021-02-05) 17e5516e60 (FetchContent: Invoke steps directly and avoid a separate sub-build, 2021-01-29) bd876f3849 (FetchContent: Restore patch command support, 2021-02-18) 404cddb7bb (ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks, 2021-02-21) b0da671243 (FetchContent: Don't update timestamps if files don't change, 2021-02-18) Fixes: #21892
* | | Merge topic 'FindMatlab-MCR-vars' into release-3.20Brad King2021-03-101-2/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 5ba1f4b6ee FindMatlab: Fix Matlab_LIBRARIES for MCR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5896
| * | FindMatlab: Fix Matlab_LIBRARIES for MCRSilvio Traversaro2021-03-091-2/+9
|/ / | | | | | | | | | | | | In commit bda5e2ac8f (FindMatlab: Only include engine and dataarray libraries if they are found, 2020-12-11, v3.20.0-rc1~297^2~1) we fixed the imported target to contain optional libraries only if they are found. Do the same for `Matlab_LIBRARIES`.
* | Merge branch 'release-3.19' into release-3.20Brad King2021-03-090-0/+0
|\ \ | |/
| * Merge branch 'CrayPrgEnv-detection' into release-3.19Brad King2021-03-083-5/+5
| |\ | | | | | | | | | Merge-request: !5889
* | \ Merge topic 'CrayPrgEnv-detection' into release-3.20Brad King2021-03-093-5/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5889
| * | Revert "Cray: Fix Cray compiler detection on new platforms"Brad King2021-03-083-5/+5
| |/ | | | | | | | | | | | | | | | | | | The justification in commit 9ee4a42813 (Cray: Fix Cray compiler detection on new platforms, 2020-12-01, v3.19.2~26^2) confuses detection of the CrayPrgEnv with identification of the Cray compiler. The change regressed detection of the CrayPrgEnv on non-Cray compilers. Revert it pending further investigation into the original problem. Fixes: #21894
* | Merge topic 'cray-fortran' into release-3.20Brad King2021-03-081-0/+4
|\ \ | | | | | | | | | | | | | | | | | | ef513fe3d1 Cray: Enable explicit Fortran preprocessing for Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5882
| * | Cray: Enable explicit Fortran preprocessing for Ninja generatorBrad King2021-03-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Cray 11.0 adds support for preprocessing with output written to a specified file (instead of always next to the source). Use it to enable Cray Fortran with the Ninja generator. Patch-by: James Elliott Fixes: #20731
* | | Merge topic 'cmake-gui-search-case' into release-3.20Brad King2021-03-052-4/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 9ec50ff157 cmake-gui: Restore search bar case insensitivity Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5878
View Lorry Controller Status