summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2020-12-131-1/+1
|
* CMake Nightly Date StampKitware Robot2020-12-121-1/+1
|
* Merge branch 'release-3.19'Brad King2020-12-110-0/+0
|\
| * Merge topic 'apple-silicon-host-arch' into release-3.19Brad King2020-12-1122-16/+245
| |\ | | | | | | | | | | | | | | | | | | | | | b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts 5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5589
* | \ Merge topic 'apple-silicon-host-arch'Brad King2020-12-1122-16/+245
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts 5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5589
| * | Tests: Cover macOS host architecture selection on Apple Silicon hostsBrad King2020-12-1014-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test cases verifying that `CMAKE_APPLE_SILICON_PROCESSOR` set as either a cache or environment variable causes that to be selected as the host architecture. Also verify that sources compile using whatever is selected as the host architecture, even when the explicit setting is not used. Issue: #21554
| * | macOS: Offer control over host architecture on Apple Silicon hostsBrad King2020-12-108-16/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b6c60f14b6 (macOS: Default to arm64 architecture on Apple Silicon hosts, 2020-09-28, v3.19.0-rc1~63^2) we use `sysctl` to detect that we are running on Apple Silicon in a way that pierces Rosetta. This always sets `CMAKE_HOST_SYSTEM_PROCESSOR` to be `arm64` on such hosts. However, macOS offers strong support for running processes under an emulated `x86_64` architecture. Teach CMake to select either `arm64` or `x86_64` as the host architecture on Apple Silicon based on the architecture of its own process. When CMake is built as a universal binary, macOS will select whichever slice (architecture) is appropriate under the user's shell, and `CMAKE_HOST_SYSTEM_PROCESSOR` will match. Also offer a `CMAKE_APPLE_SILICON_PROCESSOR` variable and environment variable to provide users with explicit control over the host architecture selection regardless of CMake's own architecture. Finally, if `CMAKE_OSX_ARCHITECTURES` is not set, pass explicit flags to the toolchain to use selected host architecture instead of letting the toolchain pick. Fixes: #21554
* | | Merge branch 'release-3.19'Brad King2020-12-110-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'doc-3_19_release-fixes' into release-3.19Brad King2020-12-116-65/+78
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | ff4d1d44f2 Help: Clarify scope details of deferred call ids for cmake_language() b4c02a0a1d Help: Re-sort indexes in the manuals 2c33949c64 Help: Mention how OPTIMIZE_DEPENDENCIES is initialized 0816482302 Help: xref variable that cmake_minimum_required() sets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5598
* | | Merge topic 'doc-3_19_release-fixes'Brad King2020-12-116-64/+77
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3765a415df Merge branch 'master' into doc-3_19_release-fixes ff4d1d44f2 Help: Clarify scope details of deferred call ids for cmake_language() b4c02a0a1d Help: Re-sort indexes in the manuals 2c33949c64 Help: Mention how OPTIMIZE_DEPENDENCIES is initialized 0816482302 Help: xref variable that cmake_minimum_required() sets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5598
| * \ \ Merge branch 'master' into doc-3_19_release-fixesBrad King2020-12-11992-9371/+18650
| |\ \ \ | |/ / / |/| | / | | |/ | |/|
* | | CMake Nightly Date StampKitware Robot2020-12-111-1/+1
| | |
* | | Merge branch 'release-3.19'Brad King2020-12-100-0/+0
|\ \ \ | | |/ | |/|
* | | Merge topic 'rel-macos-apple-silicon'Brad King2020-12-109-13/+161
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56a075eb5d ci: update macOS package to produce universal binaries b184cc256b ci: do not use sccache for macOS packaging 41bddf1028 ci: update to pre-built Qt 5.9.9 universal binaries for macOS packages b201dc0d42 Utilities/Release: Add script to build Qt 5.9.9 macOS universal binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5595
* \ \ \ Merge topic 'cpp23'Brad King2020-12-1021-46/+80
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f3c70a333 CUDA, CXX, OBJCXX: C++23 support with Clang 12 af7e1545c8 CUDA, CXX: Remove HAS_FULL_SUPPORT for C++17 and 20 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5576
| * | | | CUDA, CXX, OBJCXX: C++23 support with Clang 12Raul Tambre2020-12-0820-15/+76
| | | | | | | | | | | | | | | | | | | | | | | | | Clang 12 landed initial support for C++23 language mode flag -std={c|gnu}++2b in commit 6627a3c2873fdf7ccba1a1573371079be48b36e8.
| * | | | CUDA, CXX: Remove HAS_FULL_SUPPORT for C++17 and 20Raul Tambre2020-12-083-31/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake has no features for C++ versions past 14 and it seems unlikely we'd want to add any. Remove the related code.
* | | | | Merge topic 'cmake.el'Brad King2020-12-101-10/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54b409094d cmake-mode.el: Improve help display with reStructuredText mode Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jostein Kjønigsen <jostein@kjonigsen.net> Merge-request: !5575
| * | | | | cmake-mode.el: Improve help display with reStructuredText modecondy2020-12-081-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the `cmake --help-*` options print `.rst` source documents with only partial evaluation. View them in the Emacs `rst-mode`.
* | | | | | Merge topic 'EML-Support'Brad King2020-12-102-0/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6df83a690 Find{BLAS,LAPACK}: Add support for Elbrus Math Library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5590
| * | | | | | Find{BLAS,LAPACK}: Add support for Elbrus Math LibraryIgor S. Gerasimov2020-12-092-0/+59
| |/ / / / / | | | | | | | | | | | | | | | | | | http://mossigplan.acm.org/EML_introduction_engl.pdf
* | | | | | Merge branch 'release-3.19'Brad King2020-12-100-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge topic 'test-macos-version'Brad King2020-12-102-17/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55193c8013 ci: Hard-code XCTest deployment target to 10.15 40877903ac Tests: Remove outdated exclusion of tests on OS X 10.3 c404d7f221 Tests: Add cache entry to control XCTest deployment target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5593
* \ \ \ \ \ \ \ Merge branch 'release-3.19'Brad King2020-12-100-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge topic 'ispc-system-includes'Brad King2020-12-105-2/+37
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8da25e4a3c ISPC: Treat system includes as '-I' includes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5591
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-12-101-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'xcode-ios-empty-sticker-pack'Brad King2020-12-091-0/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a60d1b6b4 Allow empty source file list for iOS Sticker packs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5587
| * | | | | | | | | | Allow empty source file list for iOS Sticker packsAndrew Shaitorov2020-12-061-0/+8
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'gen-vs-intel-dpcpp-compiler-support'Brad King2020-12-091-3/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7808cbd644 CMakeDetermineCompilerId: support Intel DPC++ compiler toolset for VS gen Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5579
| * | | | | | | | | | | CMakeDetermineCompilerId: support Intel DPC++ compiler toolset for VS genNikita Sirgienko2020-12-061-3/+10
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before Intel have only one compiler icl (Intel(R) C++ compiler) and CMakeDetermineCompilerId has considered, that all toolchains with a word "Intel" in the toolchain name is a icl compiler. But now Intel have also other compiler - Intel(R) DPC++ compiler, which haven't working with cmake on Visual Studio Generator because cmake try to use icl compiler, which cmake can't found and because of this fails the configuration. This commit fix this problem, and both compilers start to work correctly with Visual Studio generator. Fixes: #21546
* | | | | | | | | | | Merge topic 'android-docs'Brad King2020-12-092-2/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a4b1cca1c Android: update documentation for NDK integration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5586
| * | | | | | | | | | | Android: update documentation for NDK integrationHaibo Huang2020-12-082-2/+14
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'cmp0116-automoc'Brad King2020-12-096-8/+42
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1080935732 AutoGen: Account for CMP0116 in the depfile 287c591079 cmake -E: Fix cmake_transform_depfile escaping of transformed paths Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5584
| * | | | | | | | | | | | AutoGen: Account for CMP0116 in the depfileKyle Edwards2020-12-085-7/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21467
| * | | | | | | | | | | | cmake -E: Fix cmake_transform_depfile escaping of transformed pathsBrad King2020-12-081-1/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b2c14bc774 (cmake -E: Add cmake_transform_depfile internal command, 2020-10-02) we forgot to use `WriteFilenameGcc` in one place.
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-12-091-1/+1
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge topic 'range-for-avoid-tmp-warning'Brad King2020-12-081-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99a26babb1 Cleanup: Fix warning about binding to a temporary in range-based for Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5578
| * | | | | | | | | | | Cleanup: Fix warning about binding to a temporary in range-based forCraig Scott2020-12-071-1/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'release-3.19'Brad King2020-12-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'update_cmp112'Brad King2020-12-082-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf0c71dae3 Document CMP0112 covers $<TARGET_FILE_NAME,tgt> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5582
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.18'Brad King2020-12-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'FindPython-python2-soabi-suffix-fix' into release-3.18Brad King2020-12-071-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5574
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.19'Brad King2020-12-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'FindPython-python2-soabi-suffix-fix'Brad King2020-12-081-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afb0ffcac7 FindPython2: avoid doubling the extension in CPython2 SOABI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5574
* | | | | | | | | | | | | | | | | Merge branch 'release-3.19'Brad King2020-12-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'correct_ispc_path_computation'Brad King2020-12-085-15/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9af93fef11 ISPC: Handle OBJECT sources in different directories 72ae15ebcb ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5581
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.19'Brad King2020-12-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'remove-partial-intel-compiler-support'Brad King2020-12-084-18/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41b69348a5 Revert "Intel: Add Intel DPC++ compiler identification" f0babb53b3 Revert "Intel: Add Intel Clang compiler identification" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Axel Huebl <axel.huebl@plasma.ninja> Merge-request: !5583
* | | | | | | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-12-081-1/+1
| |_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge topic 'get_dir_prop_arg_parsing'Brad King2020-12-0711-18/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab1ee5aab8 get_directory_property: Check for empty or missing property name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5577