summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/
* Merge branch 'release-3.18' into release-3.19Brad King2021-02-110-0/+0
|\
| * CMake 3.18.6v3.18.6Brad King2021-02-111-1/+1
| |
| * Merge branch 'lexer-posix-source' into release-3.18Brad King2021-02-051-1/+1
| |\ | | | | | | | | | Merge-request: !5776
* | \ Merge topic 'clang-imsvc' into release-3.19Brad King2021-02-102-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2fc5e5dba9 Clang: Use -imsvc for system include only with MSVC-like front-end Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr> Merge-request: !5792
| * | | Clang: Use -imsvc for system include only with MSVC-like front-endBrad King2021-02-092-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit bb61c2d024 (Clang: use -imsvc for system include dirs when running on Windows, 2020-09-16, v3.19.0-rc1~162^2) we added `-imsvc` for all Clang compilers targeting the MSVC ABI. However, the option only exists for the MSVC-like front-end. The GNU-like front-ends use `-isystem`. Fixes: #21789
* | | | Merge topic 'ctest-dashboard-with-modified-files' into release-3.19Brad King2021-02-101-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 33fa015b4a CTest: Restore running dashboard client Test step with modified files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5791
| * | | CTest: Restore running dashboard client Test step with modified filesBrad King2021-02-091-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 6a6f1d1edd (CTest: exit nonzero after message(SEND_ERROR|FATAL_ERROR), 2020-04-03, v3.19.0-rc1~260^2), `ctest` no longer runs tests if there are errors before the full set of tests is defined. Such errors were previously treated more like warnings. The change exposed some cases where we were issuing an error message but proceeding to run tests anyway. The above commit downgraded one such case (missing `DartConfiguration.tcl`) to a warning explicitly in order to restore its former warning-like semantics. Downgrade the Update step's diagnostic about modified or conflicting files to a warning for the same reason. Fixes: #21783
* | | Merge topic 'FindXCTest-bundle-inject' into release-3.19Brad King2021-02-091-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eafe740ead FindXCTest: Fix output directory for test bundle with new build system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5786
| * | | FindXCTest: Fix output directory for test bundle with new build systemYauheni Khnykin2021-02-081-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The output directory was still correct for macOS with the new build system, but not for iOS. Fixes: #20662
* | | | Merge topic 'xcode12-ios_install_combined' into release-3.19Brad King2021-02-098-21/+109
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 0110aa018d IOS_INSTALL_COMBINED: Support Xcode 12 (command line only) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5785
| * | | IOS_INSTALL_COMBINED: Support Xcode 12 (command line only)Craig Scott2021-02-088-21/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 12 doesn't allow nested builds within the same build directory. That means we can no longer do an install by building the install target when IOS_INSTALL_COMBINED is true. We can, however, still do an install by running the cmake_install.cmake script or executing cmake --install, since there is no outer build and therefore the associated SDK can be built as a sub-build. The non-build methods previously didn't work when IOS_INSTALL_COMBINED was true because the generated install script and the CMakeIOSInstallCombined script both made certain assumptions that relied on being part of a build. Those assumptions are now removed. A side-effect of this work is that cpack now also works from the command line when IOS_INSTALL_COMBINED is true. Relates: #21282 Fixes: #20023
* | | | Merge topic 'lexer-posix-source' into release-3.19Brad King2021-02-081-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | a8b41e2c68 LexerParser: Do not override existing _POSIX_C_SOURCE definition 82cfeeb484 Merge branch 'backport-3.18-ci-wix-download' into release-3.18 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5776
| * | LexerParser: Do not override existing _POSIX_C_SOURCE definitionBrad King2021-02-051-1/+1
| |/ | | | | | | | | | | | | | | | | | | In commit f034b0f663 (CMake compilation: do not use compiler extensions, 2020-03-14, v3.18.0-rc1~494^2) we explicitly defined `_POSIX_C_SOURCE` to ensure availability of POSIX APIs even when compiler extensions are not enabled. Update the code to avoid redefining `_POSIX_C_SOURCE` if it is already defined. This occurs when building our release binaries as configured in `Utilities/Release/linux`, where we define `_POSIX_C_SOURCE` explicitly on the compiler command line.
| * Merge branch 'backport-3.18-ci-wix-download' into release-3.18Brad King2021-01-214-0/+23
| |\ | | | | | | | | | Merge-request: !5725
* | \ Merge topic 'doc-find-env-vars' into release-3.19Brad King2021-02-053-3/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c40e81ce80 Help: Restore docs that find_library considers LIB, not INCLUDE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5772
| * | | Help: Restore docs that find_library considers LIB, not INCLUDEBrad King2021-02-043-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation updates in commit 02f527c66a (Find: Provide global controls for the `NO_[]_PATH` call options, 2019-06-12, v3.16.0-rc1~541^2) accidentally switched the `find_library` documentation to mention `INCLUDE` where it should be `LIB`. While at it, update `find_file` and `find_path` to mention `INCLUDE` and `PATH` in the order they are considered.
* | | | Merge topic 'FindBoost-1.75' into release-3.19Brad King2021-02-041-2/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8293064760 FindBoost: Add support for Boost 1.75 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5768
| * | | | FindBoost: Add support for Boost 1.75Brad King2021-02-031-2/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the list of known versions. Run the command cmake -DBOOST_DIR=/path/to/boost_1_75_0 \ -P Utilities/Scripts/BoostScanDeps.cmake to extract dependencies from the 1.75.0 source tree. They differ from 1.74's dependencies by the addition of dependencies of the json component, so add a new version block to FindBoost. Fixes: #21773
* | | | Merge topic 'xcode-framework-path' into release-3.19Brad King2021-02-047-18/+62
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 5389bb4274 Xcode: Don't hard-code SDK-provided implicit framework search paths df08f8df30 cmComputeLinkInformation: Fix misspelt private variable name 375b307bae Apple: Fix linking to frameworks that do not exist until build time Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5760
| * | | Xcode: Don't hard-code SDK-provided implicit framework search pathsCraig Scott2021-02-033-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a framework is linked to a target by its full path and that framework is located in one of the implicit framework search directories, CMake 3.18.5 and earlier discarded that path. ce2dee9e5ba (Xcode: Don't add framework as -framework argument in linker info list, 2020-09-28) introduced a regression which resulted in the framework path always being added to the search path even if it matched one of the implicit search paths. This broke the ability to do device and simulator builds from the same configured project. Fixes: #21678
| * | | cmComputeLinkInformation: Fix misspelt private variable nameCraig Scott2021-02-032-4/+4
| | | |
| * | | Apple: Fix linking to frameworks that do not exist until build timeBrad King2021-02-026-13/+37
| | | | | | | | | | | | | | | | Fixes: #21621
* | | | Merge topic 'findcudatoolkit_env_path' into release-3.19Brad King2021-02-031-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 4ea6d3c3ae FindCUDAToolkit: Restore use of CUDA_PATH environment variable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5761
| * | | FindCUDAToolkit: Restore use of CUDA_PATH environment variableRobert Maynard2021-02-031-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 7cc815a2a6 (CUDAToolkit: Detect CUDA SDK that don't have nvcc, 2020-07-24, v3.19.0-rc1~366^2) accidentally broke use of the `CUDA_PATH` environment variable. Fixes: #21740
* | | CMake 3.19.4v3.19.4Brad King2021-01-281-1/+1
| | |
* | | Merge topic 'doc-multi-config-prop' into release-3.19Brad King2021-01-251-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d7daa668c Help: Add Ninja Multi-Config to list in GENERATOR_IS_MULTI_CONFIG Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5737
| * | | Help: Add Ninja Multi-Config to list in GENERATOR_IS_MULTI_CONFIGBrad King2021-01-251-2/+6
| | | | | | | | | | | | | | | | Fixes: #21739
* | | | Merge topic 'intel-fortran-nofor-main' into release-3.19Brad King2021-01-251-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 2a5955ac09 Intel: Replace deprecated Fortran flag -nofor_main with -nofor-main Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5729
| * | | Intel: Replace deprecated Fortran flag -nofor_main with -nofor-mainBrad King2021-01-221-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | The `-nofor_main` flag was originally added by commit ccdd3e943d (Fix Intel Fortran SHARED libraries on Linux, 2009-10-27, v2.8.2~915). Since then, Intel Fortran renamed the option to `-nofor-main` and deprecated the old name. The new name has been available for a long time, so we can just switch to it. Fixes: #21735
* | | Merge topic 'ci-wix-download' into release-3.19Brad King2021-01-214-0/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 127864aa9c Merge branch 'backport-3.18-ci-wix-download' into ci-wix-download 8efbb0c95f ci: download WiX on Windows 5e5fecb7bc ci: speed up cmake and ninja downloads on Windows 6c34835a26 Merge branch 'backport-ninja-no-cleandead' into release-3.18 41ec2a4fac Merge branch 'FindPython-python2-soabi-suffix-fix' into release-3.18 035a0c497a Merge branch 'cuda_detect_vs_codegen' into release-3.18 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5725
| * \ \ Merge branch 'backport-3.18-ci-wix-download' into ci-wix-downloadBrad King2021-01-214-0/+23
| |\ \ \ |/ / / / | | | _
| * | ci: download WiX on WindowsBrad King2021-01-212-0/+21
| | | | | | | | | | | | Avoid requiring Windows CI hosts to have WiX installed.
| * | ci: speed up cmake and ninja downloads on WindowsBrad King2021-01-212-0/+2
| |/ | | | | | | | | Invoke-WebRequest uses a progress bar by default, but we have no interactive session anyway. Turn it off to speed up downloads.
| * Merge branch 'backport-ninja-no-cleandead' into release-3.18Brad King2020-12-142-15/+1
| |\ | | | | | | | | | Merge-request: !5614
| * \ Merge branch 'FindPython-python2-soabi-suffix-fix' into release-3.18Brad King2020-12-071-2/+10
| |\ \ | | | | | | | | | | | | Merge-request: !5574
| * \ \ Merge branch 'cuda_detect_vs_codegen' into release-3.18Brad King2020-11-251-4/+8
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !5531
* | \ \ \ Merge topic 'vs-sdk-selection' into release-3.19Brad King2021-01-216-4/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e67482daf VS: Generalize Win10 max SDK version to all VS generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5721
| * | | | | VS: Generalize Win10 max SDK version to all VS generatorsjonathan molinatto2021-01-206-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM` variable added in CMake 3.19 by commit ba497111f6 (VS: Add option for custom Win10 SDK version maximum, 2020-08-20, v3.19.0-rc1~262^2) was documented as if it worked for all generators but implemented only to override CMake's builtin default for the VS 2015 max SDK version. Generalize the variable to set a custom max SDK version for later VS versions too. Fixes: #21720
* | | | | | Merge topic 'FindHDF5-silence-output' into release-3.19Brad King2021-01-211-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b924669385 FindHDF5: silence STATUS messages when found with QUIET 2439a048b0 FindHDF5: avoid writing to the output when testing h5cc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5722
| * | | | | | FindHDF5: silence STATUS messages when found with QUIETBen Boeckel2021-01-201-3/+3
| | | | | | |
| * | | | | | FindHDF5: avoid writing to the output when testing h5ccBen Boeckel2021-01-201-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The execution of this tool can output error logs to the output during configure. This can then be caught by CTest and flagged as an error during the build.
* | | | | | Merge topic 'macos-include-weak-dependencies' into release-3.19Brad King2021-01-214-4/+37
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected f2d92b983b GetPrerequisites: Include weak macOS dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5703
| * | | | | file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detectedBianca van Schaik2021-01-203-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Clang 12, `otool -l` reports `LC_LOAD_WEAK_DYLIB` instead of `LC_LOAD_DYLIB` for weakly linked libraries. Update the implementation of `file(GET_RUNTIME_DEPENDENCIES)` to recognize these. Fixes: #21684
| * | | | | GetPrerequisites: Include weak macOS dependenciesBianca van Schaik2021-01-201-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Clang 12, `otool -L` adds `, weak` to weakly linked libraries. Update GetPrerequisites to recognize these. Issue: #21684
* | | | | Merge topic 'CMake-cross-compiling' into release-3.19Brad King2021-01-191-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6cee4c6a8b Restore support for cross-compiling CMake itself Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5713
| * | | | | Restore support for cross-compiling CMake itselfMarc Chevrier2021-01-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit eb583b0a66 (cmake_path command: path management, 2020-07-23, v3.19.0-rc1~216^2~1) we added a `try_run`. In cross-compilation mode, C++ features tests must avoid running tests if there is no emulator defined.
* | | | | | Merge topic 'irsl-msvcp_atomic_wait_dll' into release-3.19Brad King2021-01-181-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6718caaa2f IRSL: Install msvcp${v}${d}_atomic_wait.dll if available with CRT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5702