summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
* CMake 3.19.8v3.19.8Brad King2021-04-061-1/+1
|
* Merge branch 'backport-3.19-rel-file-table' into release-3.19Brad King2021-04-064-20/+64
|\
| * Merge branch 'release-3.19' into backport-3.19-rel-file-tableBrad King2021-04-0568-187/+591
| |\
| * | Utilities/Release: Update file table for 3.19.3Brad King2021-04-054-6/+48
| | |
| * | Merge tag 'v3.19.3' into backport-3.19-rel-file-tableBrad King2021-04-0545-95/+723
| |\ \
| * | | Utilities/Release: Update file table for 3.19.2Brad King2021-04-054-18/+20
| | | |
| * | | Merge tag 'v3.19.2' into backport-3.19-rel-file-tableBrad King2021-04-05207-602/+1642
| |\ \ \
| * \ \ \ Merge branch 'backport-3.18-rel-file-table' into backport-3.19-rel-file-tableBrad King2021-04-0510-0/+409
| |\ \ \ \
* | \ \ \ \ Merge branch 'release-3.18' into release-3.19Brad King2021-04-0610-0/+409
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'backport-3.18-rel-file-table' into release-3.18Brad King2021-04-0610-0/+409
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | Merge-request: !5961
| | * | | | | Utilities/Release: Add script to generate a table of filesBrad King2021-04-059-0/+404
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22002
| | * | | | | Tests: Add RunCMake helper to run a plain scriptBrad King2021-03-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many tests covering CMake scripting commands can work without initializing a full generator.
* | | | | | | Merge branch 'libarchive-u_char' into release-3.19Brad King2021-04-061-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5981
| * | | | | | | libarchive: Use uint8_t instead of u_charBrad King2021-04-051-4/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter is not a standard type. Fixes: #22013
* | | | | | | Merge branch 'ci-test-ext-done' into release-3.19Brad King2021-04-021-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5971
| * | | | | | | gitlab-ci: Tell CDash when a test-ext job is doneBrad King2021-04-021-0/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These jobs are self-contained and so can be re-run on their own to produce a whole new submission to CDash. Tell CDash when each submission is done so re-running a job replaces results rather than accumulating them.
* | | | | | | Merge branch 'doc-CMAKE_APPLE_SILICON_PROCESSOR' into release-3.19Brad King2021-04-011-3/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | Merge-request: !5965
| * | | | | | Help: CMAKE_APPLE_SILICON_PROCESSOR cannot be set in a toolchain fileBrad King2021-04-011-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CMakeDetermineSystem` determines the host system information before loading the toolchain file. Issue: #22012
* | | | | | | Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into release-3.19Brad King2021-03-241-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5935
| * | | | | | | gitlab-ci: Update Windows builds to MSVC 19.28-16.9 toolsetBrad King2021-03-241-4/+4
|/ / / / / / /
* | | | | | | Merge branch 'backport-3.19-ci-vs-16.8-in-16.9' into release-3.19Brad King2021-03-172-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5918
| * | | | | | | 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 'ninja-regenerate-no-recompact' into release-3.19Brad King2021-03-161-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'FindPkgConfig-NAMES_PER_DIR' into release-3.19Brad King2021-03-161-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | 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
* | | | | | CMake 3.19.7v3.19.7Brad King2021-03-151-1/+1
| | | | | |
* | | | | | Merge branch 'vs-toolset-version' into release-3.19Brad King2021-03-127-96/+170
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 branch 'cray-compiler-wrapper-detection' into release-3.19Brad King2021-03-103-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 branch 'backport-xcode-framework-quoting' into release-3.19Brad King2021-03-104-1/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | 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 branch 'CrayPrgEnv-detection' into release-3.19Brad King2021-03-083-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | CMake 3.19.6v3.19.6Brad King2021-02-241-1/+1
| | | | | |
* | | | | | Merge branch 'backport-3.19-preset-no-comments' into release-3.19Brad King2021-02-248-7/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !5853
| * | | | | | CMakePresets.json: Remove undocumented support for commentsKyle Edwards2021-02-248-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21858
* | | | | | | Merge branch 'ninja-status-stderr' into release-3.19Brad King2021-02-233-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5850
| * | | | | | | Tests: Update for upstream ninja change to write status on stderrBrad King2021-02-233-0/+12
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream ninja commit `ad3d29fb53` (Put builder output through status interface) from ninja PR 1899 changed the status output from stdout to stderr. In particular, `ninja: no work to do` is now printed on stderr. Update our RunCMake tests to accept this difference. A few RunCMake test cases check for `ninja: no work to do`. For those, move the message to stdout using `RunCMake_TEST_OUTPUT_MERGE`. The rest of the test cases do not care about the message, so remove it from the actual stderr content before comparing against that expected.
* | | | | | | Merge branch 'backport-intel-fortran-preprocess' into release-3.19Brad King2021-02-181-2/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5826
| * | | | | | | Intel: Make explicit Fortran preprocessing under Ninja more robustBrad King2021-02-181-2/+10
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell the Fortran compiler to write preprocessor output directly to a file, as we do for the GNU compiler. The previous "redirect stdout" approach could break during ABI detection with some `mpif90` wrappers that add version information to stdout when called with `-v`. Fixes: #21828
* | | | | | | Merge branch 'FindPython-fix-variable-handling' into release-3.19Brad King2021-02-161-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | Merge-request: !5816
| * | | | | | FindPython: fix erroneous variable handlingMarc Chevrier2021-02-161-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | Fixes: #21817
* | | | | | CMake 3.19.5v3.19.5Brad King2021-02-151-1/+1
| | | | | |
* | | | | | Merge branch 'relnote-IOS_INSTALL_COMBINED-xcode12' into release-3.19Brad King2021-02-151-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !5811
| * | | | | | Help: Add 3.19.5 release notes for Xcode iOS-related changesCraig Scott2021-02-141-0/+17
|/ / / / / /