summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.18.0-rc1v3.18.0-rc1Brad King2020-06-091-1/+1
|
* Merge topic 'cmGeneratorTarget-include-cmProperty' into release-3.18Brad King2020-06-091-2/+1
|\ | | | | | | | | | | | | e65e88fbce cmGeneratorTarget: fix misplaced header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4864
| * cmGeneratorTarget: fix misplaced headerVitaly Stakhovsky2020-06-081-2/+1
| | | | | | | | | | | | In commit b36d1bdd9d (Single location for cmProp typedef, 2020-05-30) we accidentally left inclusion of `cmProperty.h` out of the main block of includes.
* | Merge topic 'cpack-ifw-3.2' into release-3.18Brad King2020-06-091-0/+2
|\ \ | | | | | | | | | | | | | | | | | | b79aad8069 CPack/IFW: Add Qt installer framework version 3.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4859
| * | CPack/IFW: Add Qt installer framework version 3.2Frederik Gladhorn2020-06-081-0/+2
| |/ | | | | | | Qt 5.15 comes with IFW 3.2
* | Merge topic 'FindOpenSSL-3.0' into release-3.18Brad King2020-06-091-2/+4
|\ \ | | | | | | | | | | | | | | | | | | 796b447373 FindOpenSSL: Fix OpenSSL 3.0.0 version extraction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4860
| * | FindOpenSSL: Fix OpenSSL 3.0.0 version extractionBilly Brumley2020-06-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix the regex syntax added by commit 61d746e592 (FindOpenSSL: Detect OpenSSL 3.0.0, 2020-05-27, v3.17.3~1^2). Add missing escapes. Test with `openssl-3.0.0-alpha3`. While at it, also unset a temporary variable after use.
* | | Merge topic 'doc-gitlab-ci' into release-3.18Craig Scott2020-06-091-34/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 855ed80111 Help/dev: Update CMake Review Process document for GitLab CI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4865
| * | | Help/dev: Update CMake Review Process document for GitLab CIBrad King2020-06-091-34/+31
| | |/ | |/| | | | | | | | | | We have replaced use of `buildbot` with GitLab CI. Update the relevant section of our review process documentation.
* | | Merge topic 'doc-testprop-DEPENDS-REQUIRED_FILES' into release-3.18Craig Scott2020-06-092-1/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b75175219 Help: Add example for REQUIRED_FILES test property 61139c91d2 Help: Add example for DEPENDS test property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4853
| * | | Help: Add example for REQUIRED_FILES test propertyMichael Hirsch2020-06-091-1/+32
| | | |
| * | | Help: Add example for DEPENDS test propertyMichael Hirsch2020-06-091-0/+12
| | | |
* | | | Merge topic 'remove-unused-ci-script' into release-3.18Brad King2020-06-081-22/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | f8b2d8f178 ci: remove unused sccache download script Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4866
| * | | ci: remove unused sccache download scriptBen Boeckel2020-06-081-22/+0
|/ / /
* | | Merge topic 'cpack_typo' into release-3.18Brad King2020-06-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f859e6f812 CPack/IFW: Fix documentation typo: REQUARED Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4862
| * | | CPack/IFW: Fix documentation typo: REQUAREDFrederik Gladhorn2020-06-081-1/+1
|/ / /
* | | Merge topic 'vs-add_package_reference_install' into release-3.18Brad King2020-06-083-1/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3fd07d30bf VS: Enable DOTNET_TARGET_FRAMEWORK properties all target types Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4854
| * | | VS: Enable DOTNET_TARGET_FRAMEWORK properties all target typesKinan Mahdi2020-06-053-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes them compatible with `VS_PACKAGE_REFERENCES` and, in particular, fixes nuget package references in combination with install targets. Fixes: #20764
* | | | Merge topic 'cuda_cudart_status' into release-3.18Brad King2020-06-081-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e2f86461a FindCUDAToolkit: Fix cudart not found status message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4861
| * | | | FindCUDAToolkit: Fix cudart not found status messageRaul Tambre2020-06-081-4/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | This ended up after the searching after commit dc2eae1 (FindCUDAToolkit: Factor out discovery code into a separate file, 2020-04-22). Move it back to where it was and should be.
* | | | Merge topic 'cuda_clang_simulate' into release-3.18Brad King2020-06-081-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f88b7a592 CUDA: Fix Clang depfile flags when simulating MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4863
| * | | | CUDA: Fix Clang depfile flags when simulating MSVCRaul Tambre2020-06-081-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __compiler_clang() doesn't call __compiler_gnu() if we're emulating MSVC. Thus CMAKE_DEPFILE_FLAGS_CUDA remains unset and compiling doesn't work, due to NVCC dependency injection workaround in CMakeCUDAInformation.cmake, which triggers for Ninja if they're not set. Always set the depfile flags to fix this. Most other compiler modules seem to do the same.
* | | | Merge topic 'cuda_user_architectures_specifiers' into release-3.18Brad King2020-06-081-2/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4eaf1ef425 CUDA: Fix checking working architectures with specifiers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4856
| * | | CUDA: Fix checking working architectures with specifiersRaul Tambre2020-06-051-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't distinguish real/virtual architectures during compiler detection. If the user passes -DCMAKE_CUDA_ARCHITECTURES="70-virtual" we'll test with only the real architecture. If it works "architectures" will end up as "70". We check equality using strings, so this fails and we incorrectly throw an error. Fix this by comparing against CMAKE_CUDA_ARCHITECTURES with the specifiers stripped. We need to deduplicate tested_architectures for the same reason in case the user specified something like "70-real;70-virtual".
* | | | Merge topic 'cuda-arch-cmp0104' into release-3.18Brad King2020-06-051-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5bf9a290e7 CUDA: Fix CUDA_ARCHITECTURES policy CMP0104 check in try_compile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4857
| * | | | CUDA: Fix CUDA_ARCHITECTURES policy CMP0104 check in try_compileBrad King2020-06-051-0/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e98588aaba (CUDA: Add CUDA_ARCHITECTURES target property, 2020-03-12), `CMAKE_CUDA_ARCHITECTURES` is both initialized and required by policy CMP0104's `NEW` behavior. Inside a `try_compile` project we use `cmake_minimum_required(VERSION ...)` with the current running version of CMake. Now that our version number is 3.18, `CMP0104` gets set to `NEW` in the `try_compile`. If the outer projects does not set the policy then `CMAKE_CUDA_ARCHITECTURES` is not available and the `try_compile` fails to generate. Teach `try_compile` to check the outer project's policy status and set policy CMP0104 to `OLD` if needed to match. Fixes: #20794
* | | | Begin 3.18 release versioningBrad King2020-06-051-3/+3
| | | |
* | | | Help: Drop development topic notes to prepare releaseBrad King2020-06-052-9/+0
| | | | | | | | | | | | | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* | | | Merge topic 'doc-3.18-relnotes'Brad King2020-06-0562-370/+301
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 389ca18289 Help: Organize and revise 3.18 release notes ab6b5c01ea Help: Consolidate 3.18 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4845
| * | | Help: Organize and revise 3.18 release notesBrad King2020-06-031-169/+211
| | | | | | | | | | | | | | | | | | | | Add section headers similar to the 3.18 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * | | Help: Consolidate 3.18 release notesBrad King2020-06-0362-370/+259
| | | | | | | | | | | | | | | | | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.18.rst`.
* | | | Merge topic 'reduce-try_compile'Brad King2020-06-057-45/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f3923893c libarchive: Map fixed-size integer types from KWIML as typedefs d20bf471c8 liblzma: Map fixed-size integer types from KWIML as typedefs 92c4316d81 KWSys: Hard-code try_compile results on Windows 2bc89f1a03 cmSystemTools: Hard-code try_compile results for Windows d350d4668a libarchive: Hard-code try_compile results for bundled dependencies bf60ac24ae Source: Assume elf.h does not exist on Windows f408cc2c40 expat: Remove unused try_compile checks 6c4f3dcd7b Utilities: Update hard-coded try_compile results for third-party libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4848
| * | | | libarchive: Map fixed-size integer types from KWIML as typedefsBrad King2020-06-031-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit ade3b16e63 (libarchive: Use KWIML to get fixed-size integer types, 2020-06-01) accidentally changed the method of defining `int#_t` types from `typedef` to `#define`. Change it back to `typedef`. Reported-by: Rolf Eike Beer <eike@sf-mail.de>
| * | | | liblzma: Map fixed-size integer types from KWIML as typedefsBrad King2020-06-031-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 12e7bfcbf4 (liblzma: Use KWIML to get fixed-size integer types, 2020-05-25) accidentally changed the method of defining `int#_t` types from `typedef` to `#define`. Change it back to `typedef`. Reported-by: Rolf Eike Beer <eike@sf-mail.de>
| * | | | KWSys: Hard-code try_compile results on WindowsBrad King2020-06-031-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Several of KWSys's checks have the same result on all Windows platforms supported when building CMake.
| * | | | cmSystemTools: Hard-code try_compile results for WindowsBrad King2020-06-031-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | All Windows platforms offer `environ` in `stdlib.h` and do not have `unsetenv`.
| * | | | libarchive: Hard-code try_compile results for bundled dependenciesBrad King2020-06-031-0/+12
| | | | |
| * | | | Source: Assume elf.h does not exist on WindowsBrad King2020-06-031-1/+3
| | | | |
| * | | | expat: Remove unused try_compile checksBrad King2020-06-032-17/+0
| | | | |
| * | | | Utilities: Update hard-coded try_compile results for third-party librariesBrad King2020-06-031-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The integer size checks have been replaced with KWIML so their hard-coded results are no longer needed. Tell `TEST_BIG_ENDIAN` to use `unsigned short` as the 16-bit integer. UNIX device APIs do not exist on Windows. FreeBSD libmd does not exist on Windows. Fix typo in existing `HAVE_READPASSPHRASE_H` setting.
* | | | | Merge topic 'msbuild-utf8-enable'Brad King2020-06-056-5/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e219527a72 VS: Use StdOutEncoding for VS 16.7 Preview 3 and above 8a7ad923a8 VS: Extract instance version from VS Installer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4847
| * | | | | VS: Use StdOutEncoding for VS 16.7 Preview 3 and aboveJustin Goshi2020-06-034-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 16.6 added a `StdOutEncoding` setting for custom commands to tell MSBuild that the output is encoded as UTF-8. In commit bc877a7e94 (Add support to indicate UTF-8 custom command pipe output encoding, 2020-04-08) CMake learned to add the setting in anticipation of the VS 16.6 release. However, when 16.6 was released it had a bug in the implementation of custom tasks with StdOutEncoding enabled that was exposed by our test suite. In commit 5058fb5401 (VS: Drop StdOutEncoding with VS 16.6 pending investigation, 2020-05-29) we disabled the setting pending investigation. The problem is fixed in VS 16.7 Preview 3, so restore use of the setting when a VS instance of at least that version is detected. Fixes: #20769
| * | | | | VS: Extract instance version from VS InstallerJustin Goshi2020-06-034-0/+23
| |/ / / /
* | | | | Merge topic 'armclang-mcpu/armlink--cpu_options'Brad King2020-06-051-10/+57
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef816610be ARMClang: allow fallback to -march and correct setting of --cpu flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4850
| * | | | | ARMClang: allow fallback to -march and correct setting of --cpu flagsOsama Moharam2020-06-031-10/+57
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | allows cmake to fall back to CMAKE_SYSTEM_ARCH in case CMAKE_SYSTEM_PROCESSOR is not in armclang -mcpu=list additionally checks if CMAKE_SYSTEM_PROCESSOR belongs to armlink --cpu=list Fixes: #19962
* | | | | Merge topic 'cuda_clang_separable_error'Brad King2020-06-052-15/+31
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1243201e7 CUDA: Don't RunCMake generate separable compilation tests on Clang 1b4c690543 CUDA: Throw error if CUDA_SEPARABLE_COMPILATION is ON when using Clang Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4827
| * | | | CUDA: Don't RunCMake generate separable compilation tests on ClangRaul Tambre2020-06-031-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building these targets was already previously disabled in RunCMakeTest.cmake. Now with us throwing an error for separable compilation during generation on Clang we also need to stop them from being generated.
| * | | | CUDA: Throw error if CUDA_SEPARABLE_COMPILATION is ON when using ClangRaul Tambre2020-06-021-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Separable compilation isn't supported yet on Clang. Let's throw a helpful error instead of confusing errors during the build.
* | | | | CMake Nightly Date StampKitware Robot2020-06-051-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-06-041-1/+1
| | | | |