summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'curl-http2'Brad King2020-04-0656-2/+31109
|\ | | | | | | | | | | | | | | | | | | | | | | 02dd24a928 curl: Enable HTTP/2 support by using nghttp2 a24dd93e93 curl: When building inside CMake, link dependencies as PRIVATE 0b872fd4be nghttp2: Build the library within CMake for use by our curl cd5a320d68 Merge branch 'upstream-nghttp2' into curl-http2 5dc6921805 nghttp2 2019-11-15 (cc05c5fe) 1b8e2c2a3d nghttp2: Add script to import from upstream Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4560
| * curl: Enable HTTP/2 support by using nghttp2Brad King2020-04-032-0/+9
| |
| * curl: When building inside CMake, link dependencies as PRIVATEBrad King2020-04-031-1/+1
| |
| * nghttp2: Build the library within CMake for use by our curlBrad King2020-04-034-1/+84
| | | | | | | | | | | | Provide our own minimal `config.h` since the upstream one is much larger to support other parts of its distribution. Compile with warnings disabled since this is third-party code.
| * Merge branch 'upstream-nghttp2' into curl-http2Brad King2020-04-0148-0/+30985
| |\ | | | | | | | | | | | | | | | # By nghttp2 upstream * upstream-nghttp2: nghttp2 2019-11-15 (cc05c5fe)
| | * nghttp2 2019-11-15 (cc05c5fe)nghttp2 upstream2020-04-0148-0/+30985
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/nghttp2/nghttp2.git at commit cc05c5fe8cfc8287ddc4930fa9684af878d9e631 (v1.40.0).
| * nghttp2: Add script to import from upstreamBrad King2020-04-011-0/+30
| |
* | Merge branch 'release-3.17'Craig Scott2020-04-060-0/+0
|\ \
| * \ Merge topic 'docs-CMAKE_FIND_DEBUG_MODE' into release-3.17Craig Scott2020-04-062-1/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 477b8b5dfe Help: Improve discoverability of CMAKE_FIND_DEBUG_MODE 218bda9671 Help: Fix CMAKE_FIND_DEBUG_MODE list formatting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4569
* | \ \ Merge topic 'docs-CMAKE_FIND_DEBUG_MODE'Craig Scott2020-04-062-1/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 477b8b5dfe Help: Improve discoverability of CMAKE_FIND_DEBUG_MODE 218bda9671 Help: Fix CMAKE_FIND_DEBUG_MODE list formatting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4569
| * | | Help: Improve discoverability of CMAKE_FIND_DEBUG_MODECraig Scott2020-04-041-1/+3
| | | |
| * | | Help: Fix CMAKE_FIND_DEBUG_MODE list formattingCraig Scott2020-04-041-0/+1
| |/ /
* | | CMake Nightly Date StampKitware Robot2020-04-061-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2020-04-051-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2020-04-041-1/+1
| | |
* | | Merge topic 'pch-ios-multi-arch'Brad King2020-04-0310-214/+352
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f593b354da PCH: Add support for multi architecture iOS projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4561
| * | | PCH: Add support for multi architecture iOS projectsCristian Adam2020-04-0210-214/+352
| | | | | | | | | | | | | | | | Fixes: #20497
* | | | Merge branch 'release-3.17'Brad King2020-04-030-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'ExternalProject-no-extract-bool' into release-3.17Brad King2020-04-032-1/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c4bb705e8 ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4562
* | \ \ \ Merge topic 'ExternalProject-no-extract-bool'Brad King2020-04-032-1/+10
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 2c4bb705e8 ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4562
| * | | | ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF`Ben Boeckel2020-04-022-1/+10
| | | | | | | | | | | | | | | | | | | | Fixes: #20531
* | | | | Merge branch 'release-3.17'Brad King2020-04-030-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'rel-linux-openssl' into release-3.17Brad King2020-04-032-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a66c7674c Utilities/Release: Update to openssl 1.1.1f Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4563
* | \ \ \ \ Merge topic 'rel-linux-openssl'Brad King2020-04-032-6/+6
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a66c7674c Utilities/Release: Update to openssl 1.1.1f Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4563
| * | | | | Utilities/Release: Update to openssl 1.1.1fBrad King2020-04-032-6/+6
| | |/ / / | |/| | |
* | | | | CMake Nightly Date StampKitware Robot2020-04-031-1/+1
| | | | |
* | | | | Merge topic 'cmprop-makefile'Brad King2020-04-0217-87/+104
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aba23c747b cmMakefile::GetProperty: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4559
| * | | | | cmMakefile::GetProperty: return cmPropVitaly Stakhovsky2020-04-0117-87/+104
| | |_|_|/ | |/| | |
* | | | | Merge topic 'config-case'Brad King2020-04-025-26/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff02a592bc cmLocalGenerator: Avoid using upper-case config when not necessary a4b76c237d cmLocalGenerator: Clarify local variable name in GetTargetFlags 25a920e827 cmLocalGenerator: Convert GetStaticLibraryFlags to take original-case config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4558
| * | | | | cmLocalGenerator: Avoid using upper-case config when not necessaryBrad King2020-04-011-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to `GetLinkerLanguage`, `GetSourceFiles`, etc. can accept the original-case config name.
| * | | | | cmLocalGenerator: Clarify local variable name in GetTargetFlagsBrad King2020-04-011-12/+13
| | | | | |
| * | | | | cmLocalGenerator: Convert GetStaticLibraryFlags to take original-case configBrad King2020-04-015-14/+12
| |/ / / / | | | | | | | | | | | | | | | Move upper-case conversion of the configuration into the implementation.
* | | | | Merge topic 'discourage-cmake_install'Brad King2020-04-021-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f76839bc7 Help: Discourage direct use of cmake_install.cmake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4553
| * | | | | Help: Discourage direct use of cmake_install.cmakeKyle Edwards2020-04-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Encourage people to use cmake(1) --install instead.
* | | | | | Merge topic 'cuda_check'Brad King2020-04-021-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e758331595 cm_cxx_features: Remove CUDA installation warning filtering Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4554
| * | | | | | cm_cxx_features: Remove CUDA installation warning filteringRaul Tambre2020-04-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been fixed in upstream LLVM. No released version contains this issue. https://github.com/llvm/llvm-project/commit/d32170dbd5b0d54436537b6b75beaf44324e0c28 https://github.com/llvm/llvm-project/commit/eb2ba2ea953b5ea73cdbb598f77470bde1c6a011
* | | | | | | Merge topic 'update-kwsys'Brad King2020-04-021-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afe8a5eb3f Merge branch 'upstream-KWSys' into update-kwsys 976d29b9bd KWSys 2020-04-01 (25694819) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4556
| * \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-011-1/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-01 (25694819)
| | * | | | | | KWSys 2020-04-01 (25694819)KWSys Upstream2020-04-011-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 256948196860967904712e0c8b242057d8ea3380 (master). Upstream Shortlog ----------------- Robert Maynard (1): 4b537c59 Tests: Handle that root users on linux can always write to files
* | | | | | | | Merge branch 'release-3.16'Brad King2020-04-020-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.16Brad King2020-04-011-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4557
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-04-020-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.17Brad King2020-04-021-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4557
* | | | | | | | | | Merge topic 'FindPython-fix-VIRTUALENV-eq-FIRST'Brad King2020-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4557
| * | | | | | | | | FindPython: fix handling when FIND_VIRTUALENV == FIRSTMarc Chevrier2020-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20525
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-04-021-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge topic 'aux-install-dest'Brad King2020-04-012-10/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2642f432ef Aux: Install editor and bash files to more natural locations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4548
| * | | | | | | | | Aux: Install editor and bash files to more natural locationsEli Schwartz2020-03-312-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vim, emacs, and bash support files are not internal CMake resources and so do not belong under `CMAKE_DATA_DIR`. Move them over to proper places under the `CMAKE_XDGDATA_DIR` as we do already for cmake-gui desktop files and `cmake.m4`. Fixes: #20522
* | | | | | | | | | Merge topic 'relax_compiler_prefix_detection'Brad King2020-04-014-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5dd2ca538 DetermineCompiler: Relax _CMAKE_TOOLCHAIN_PREFIX detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4547
| * | | | | | | | | | DetermineCompiler: Relax _CMAKE_TOOLCHAIN_PREFIX detectionRobert Maynard2020-03-304-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now detect _CMAKE_TOOLCHAIN_PREFIX whenever a compilers name matches the heuristics, instead of only doing it when cross compiling