summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.20.6v3.20.6Brad King2021-09-202-3/+3
|
* Merge branch 'android-PATH' into release-3.20Brad King2021-09-161-5/+0
|\ | | | | | | Merge-request: !6528
| * Android: Restore searching PATH for executableshhb2021-09-161-5/+0
|/ | | | | | | | | | | | | Since commit a7f41a7ee4 (Android: Fix find_* search order within NDK for unified toolchains, 2020-10-13, v3.20.0-rc1~610^2), we turn off `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH`. This breaks `find_program` searching `PATH` for host executables. Fortunately, the setting turns out not to be necessary, perhaps since commit cbc51a8be3 (Android: restructure android search paths, 2020-11-06, v3.20.0-rc1~509^2). Without it, none of NDK tests fail, so remove it to restore pre-3.20 behavior. Fixes: #22634
* Merge branch 'GNUInstallDirs-variable-named-0' into release-3.20Brad King2021-08-241-1/+1
|\ | | | | | | Merge-request: !6474
| * GNUInstallDirs: avoid unwanted variable dereferenceBen Boeckel2021-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | In some situations, it seems that the variable `0` is defined. In the case found, it was set to `1`. This makes the detection of the missing third argument bogus and unnecessarily triggers a warning. This oversight was introduced in 229b5ee994 (GNUInstallDirs: Add dir argument to GNUInstallDirs_get_absolute_install_dir, 2020-10-31) prior to CMake 3.20's release cycle.
* | Merge branch 'macos-10.4' into release-3.20Brad King2021-08-021-1/+3
|\ \ | | | | | | | | | Merge-request: !6426
| * | macOS: Restore support for Mac OS X 10.4 (Tiger)Evan Miller2021-08-021-1/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4aed96e230 (Apple: Set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG on non-macOS too, 2021-04-06, v3.20.1~5^2) we always enable support for linking with `-rpath`. The intention of the change was to enable using the flag on iOS, tvOS and watchOS by avoiding a Darwin-specific version check. However, removing the check broke support for OS X 10.4 because the flag is not supported on that version. Restore a form of the check that disables the flag on OS X < 10.5 while still allowing it for the other Apple platforms. Since no one is doing iOS/tvOS/etc development on 10.4, this change should have no unintended side effects. Fixes: #22490
* | Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20Brad King2021-07-092-3/+15
|\ \ | | | | | | | | | Merge-request: !6328
| * | Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC modeBrad King2021-07-091-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Since commit 5115dd1e2c (IntelLLVM: Fix C/C++ standard level flags on Windows, 2021-07-07, v3.21.0-rc3~7^2^2) we activate C/C++ standard level logic for IntelLLVM when targeting the MSVC ABI. Update the `RunCMake.try_compile` test to be aware of this even when CMake is itself configured by an older CMake that does not know this.
| * | CMakeCCompilerId: Fix C standard detection in Clang and IntelLLVM MSVC modeRaul Tambre2021-07-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang does not define `__STDC__` if in MSVC compatibility mode, but does define `__STDC_VERSION__`. Avoid the fallback for this combination. This backports commit 7596d8b951 (CMakeCCompilerId: Fix C standard detection in Clang MSVC mode, 2021-02-07, v3.21.0-rc1~587^2~14) to the 3.20 release series. This is needed since commit 5115dd1e2c (IntelLLVM: Fix C/C++ standard level flags on Windows, 2021-07-07, v3.21.0-rc3~7^2^2) now that we activate C/C++ standard level logic for IntelLLVM when targeting the MSVC ABI.
* | | Merge branch 'FindJPEG-revert-turbo' into release-3.20Brad King2021-07-091-1/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !6326
| * | | FindJPEG: Revert "Search for 'turbojpeg' and 'turbojpeg-static' too"Brad King2021-07-091-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 74cc2e3326 (FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too, 2021-01-09, v3.20.0-rc1~176^2) pending further investigation. The "turbo" variants are not drop-in replacements on all platforms. Fixes: #22333
* | | 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.19Brad King2021-07-082-1/+10
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !6318
* | \ \ \ Merge branch 'check_cxx_compiler_flag_no_normal_variable' into release-3.20Brad King2021-07-082-1/+10
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | 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 'backport-3.20-intel-oneapi-std-windows' into release-3.20Brad King2021-07-072-12/+4
|\ \ \ \ | | |/ / | |/| | | | | | Merge-request: !6319
| * | | 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
* | | Merge branch 'backport-3.20-makefile-normalize-depfile' into release-3.20Brad King2021-07-023-6/+17
|\ \ \ | |_|/ |/| | | | | Merge-request: !6297
| * | Makefiles: Normalize compiler-generated depfile pathsMarc Chevrier2021-07-023-6/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | Even though Makefile generators pass source files and include directories by absolute path to the compiler, the compiler may generate depfile paths relative to the current working directory. For example, `ccache` with `CCACHE_BASEDIR` may transform paths this way. When reading a depfile, convert relative dependencies to absolute paths before placing them in `compiler_depend.make`, which is later evaluated in the top-level build directory. Fixes: #22364
* | CMake 3.20.5v3.20.5Brad King2021-06-211-1/+1
| |
* | Help: Add 3.20 release note section for 3.20.{3,4,5}Brad King2021-06-211-0/+7
| | | | | | | | | | | | Make it clear that the notes for these patch releases were not forgotten, and that there were simply no changes to documented features or interfaces.
* | Merge branch 'test-xcode-13' into release-3.20Brad King2021-06-212-2/+2
|\ \ | | | | | | | | | Merge-request: !6248
| * | Tests: Fix xcode version detection for Xcode 13 on ARMBrad King2021-06-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running `xcode -version` on an ARM box prints content to stderr: objc[...]: Class ... is implemented in both... One of the two will be used. Which one is undefined. Capture and parse only stdout. Otherwise we might configure test behavior for the wrong version of Xcode.
* | | Merge branch 'ep-git-update-commit-ref' into release-3.20Brad King2021-06-211-1/+1
|\ \ \ | |/ / |/| | | | | Merge-request: !6249
| * | ExternalProject: Use ${ref}^0 to avoid MSYS/Cygwin shell substitutionsCraig Scott2021-06-201-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | In 5e941a545b (ExternalProject: Ensure git fetch if updating to hash we don't have yet, 2021-05-09), the form ${ref}^{commit} was used to ensure the ref was treated as a commit. When running under a MSYS2 or Cygwin shell, the {commit} part can be translated by the shell, leaving it as ${ref}^commit, which git doesn't understand. Use the equivalent but safer form ${ref}^0, since it won't be subject to the shell substitution issue. Fixes: #22299
* | Merge topic 'fix-flow-control-override' into release-3.20Brad King2021-06-176-8/+22
|\ \ | | | | | | | | | | | | | | | | | | c017098d4d CMake: Allow override of unexpected non-flow-control commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6232
| * | CMake: Allow override of unexpected non-flow-control commandsKyle Edwards2021-06-166-8/+22
| | | | | | | | | | | | Fixes: #22310
* | | Merge topic 'vs-map-external-warnings' into release-3.20Brad King2021-06-174-14/+38
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 947f0c8b81 VS: Do not apply '/external:W*' flag table mapping on VS < 16.10 e59a208b69 cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion method d6d4af0ec3 cmGlobalVisualStudio10Generator: Move static functions to anonymous namespace Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6233
| * | VS: Do not apply '/external:W*' flag table mapping on VS < 16.10Brad King2021-06-161-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 9054cd05e6 (VS: Add flag table entries for '/external:W*' flags in VS 16.10, 2021-05-28, v3.20.4~10^2) we map flags to the `ExternalWarningLevel` element. VS 16.9 does not support that element, but its `cl` compiler does support the `/external:W*` flags. Filter out the flag table entry on older VS versions. Fixes: #22308
| * | cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion methodBrad King2021-06-163-7/+19
| | | | | | | | | | | | Port from `cmGlobalVisualStudioVersionedGenerator`.
| * | cmGlobalVisualStudio10Generator: Move static functions to anonymous namespaceBrad King2021-06-161-4/+6
|/ /
* | Merge topic 'ci-xcode-12.5' into release-3.20Brad King2021-06-161-6/+6
|\ \ | | | | | | | | | | | | | | | | | | 9c98878451 gitlab-ci: update macOS jobs to use Xcode 12.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6229
| * | gitlab-ci: update macOS jobs to use Xcode 12.5Brad King2021-06-151-6/+6
|/ /
* | CMake 3.20.4v3.20.4Brad King2021-06-141-1/+1
| |
* | Merge topic 'help-cmake_path-IS_PREFIX' into release-3.20Brad King2021-06-141-3/+4
|\ \ | | | | | | | | | | | | | | | | | | e49cbf1d44 Help: cmake_path: fix erroneous example for IS_PREFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6223
| * | Help: cmake_path: fix erroneous example for IS_PREFIXMarc Chevrier2021-06-121-3/+4
| | |
* | | Merge topic 'fileapi-link-fragments' into release-3.20Brad King2021-06-141-4/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6220
| * | fileapi: Fix codemodel-v2 link command fragment relative pathsBrad King2021-06-111-4/+5
|/ / | | | | | | | | | | | | Use the same `cmLinkLineComputer` subclass as the generator does. This affects the base directory from which relative paths are computed. Fixes: #22301
* | Merge topic 'presets-build-fixes' into release-3.20Brad King2021-06-095-13/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 534c40e6d8 presets: Fix buildPreset "targets" not allowing a single string 5d67632813 presets: Fix buildPreset "jobs" 93e396b402 presets: Fix buildPreset "jobs" field test case Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !6190
| * | presets: Fix buildPreset "targets" not allowing a single stringSam Freed2021-06-083-8/+16
| | | | | | | | | | | | Fixes: #22272
| * | presets: Fix buildPreset "jobs"Sam Freed2021-06-081-1/+3
| | | | | | | | | | | | Fixes: #22273
| * | presets: Fix buildPreset "jobs" field test caseBrad King2021-06-083-4/+22
| | | | | | | | | | | | | | | Avoid passing parallel build options to Make tools that do not support them.
* | | Merge topic 'irsl-intel-oneapi-windows' into release-3.20Brad King2021-06-091-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6d4c51c29e IRSL: Add Intel oneAPI redist location on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6199
| * | | IRSL: Add Intel oneAPI redist location on WindowsBrad King2021-06-081-1/+3
|/ / / | | | | | | | | | Fixes: #22283
* | | Merge topic 'FindBoost-json-header' into release-3.20Brad King2021-06-071-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c44dfdfdbb FindBoost: Add check for json component header in Boost 1.75+ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6193
| * | | FindBoost: Add check for json component header in Boost 1.75+John Drouhard2021-06-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | In commit 8293064760 (FindBoost: Add support for Boost 1.75, 2021-02-03, v3.19.5~9^2) the dependencies of the json component were added, but the header listing was left out.
* | | | Merge topic 'ci-sccache-consistent-builds' into release-3.20Brad King2021-06-041-33/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d7ebb47ea ci: use consistent sccache builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6156
| * | | | ci: use consistent sccache buildsBen Boeckel2021-06-021-33/+18
| | | | |
* | | | | Merge topic 'msvc_cxx20_23' into release-3.20Brad King2021-06-022-4/+20
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 886e27062b Clang/MSVC: C++20 final flag, C++23 support 3aaf1d91bf MSVC: C++20 final flag, C++23 support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Acked-by: Michael Hirsch <michael@scivision.dev> Merge-request: !6174
View Lorry Controller Status