Commit Graph

47559 Commits

Author SHA1 Message Date
Brad King 0bc64c450c Merge topic 'use-cmWorkingDirectory'
56cccde235 cmWorkingDirectory: Add GetOldDirectory method
753817e71d CPack/FreeBSD: Use RAII to save/restore working directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4566
2020-04-06 08:23:49 -04:00
Brad King 5ded334ee1 Merge topic 'curl-http2'
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
2020-04-06 08:20:01 -04:00
Craig Scott 0b01530867 Merge branch 'release-3.17' 2020-04-06 06:34:15 -04:00
Craig Scott 49b78e93a7 Merge topic 'docs-CMAKE_FIND_DEBUG_MODE'
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
2020-04-06 06:34:15 -04:00
Craig Scott 1a020d9e79 Merge topic 'docs-CMAKE_FIND_DEBUG_MODE' into release-3.17
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
2020-04-06 06:34:15 -04:00
Kitware Robot e746f1dc06 CMake Nightly Date Stamp 2020-04-06 00:01:09 -04:00
Kitware Robot 1f06acba9c CMake Nightly Date Stamp 2020-04-05 00:01:06 -04:00
Craig Scott 477b8b5dfe Help: Improve discoverability of CMAKE_FIND_DEBUG_MODE 2020-04-04 19:59:35 +11:00
Craig Scott 218bda9671 Help: Fix CMAKE_FIND_DEBUG_MODE list formatting 2020-04-04 19:59:26 +11:00
Kitware Robot ff4388e90b CMake Nightly Date Stamp 2020-04-04 00:01:12 -04:00
Brad King 56cccde235 cmWorkingDirectory: Add GetOldDirectory method 2020-04-03 09:55:49 -04:00
Brad King 753817e71d CPack/FreeBSD: Use RAII to save/restore working directory 2020-04-03 09:55:49 -04:00
Brad King f4e4b41a19 Merge topic 'pch-ios-multi-arch'
f593b354da PCH: Add support for multi architecture iOS projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4561
2020-04-03 07:05:11 -04:00
Brad King 11998c63fd Merge topic 'ExternalProject-no-extract-bool' into release-3.17
2c4bb705e8 ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4562
2020-04-03 06:58:22 -04:00
Brad King 88cd06a0fa Merge branch 'release-3.17' 2020-04-03 06:58:22 -04:00
Brad King e141c9dc15 Merge topic 'ExternalProject-no-extract-bool'
2c4bb705e8 ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4562
2020-04-03 06:58:22 -04:00
Brad King 9e0c2792c2 Merge branch 'release-3.17' 2020-04-03 06:55:36 -04:00
Brad King a554827983 Merge topic 'rel-linux-openssl' into release-3.17
3a66c7674c Utilities/Release: Update to openssl 1.1.1f

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4563
2020-04-03 06:55:35 -04:00
Brad King f0e97788e5 Merge topic 'rel-linux-openssl'
3a66c7674c Utilities/Release: Update to openssl 1.1.1f

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4563
2020-04-03 06:55:35 -04:00
Brad King 3a66c7674c Utilities/Release: Update to openssl 1.1.1f 2020-04-03 06:50:56 -04:00
Brad King 02dd24a928 curl: Enable HTTP/2 support by using nghttp2 2020-04-03 06:43:00 -04:00
Brad King a24dd93e93 curl: When building inside CMake, link dependencies as PRIVATE 2020-04-03 06:43:00 -04:00
Brad King 0b872fd4be nghttp2: Build the library within CMake for use by our curl
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.
2020-04-03 06:43:00 -04:00
Kitware Robot b44624e0ca CMake Nightly Date Stamp 2020-04-03 00:01:11 -04:00
Cristian Adam f593b354da PCH: Add support for multi architecture iOS projects
Fixes: #20497
2020-04-02 11:51:19 -04:00
Brad King e95d274f30 Merge topic 'cmprop-makefile'
aba23c747b cmMakefile::GetProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4559
2020-04-02 11:20:46 -04:00
Brad King 525bd2d5e6 Merge topic 'config-case'
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
2020-04-02 11:20:05 -04:00
Brad King a8a0564973 Merge topic 'discourage-cmake_install'
0f76839bc7 Help: Discourage direct use of cmake_install.cmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4553
2020-04-02 11:18:22 -04:00
Brad King e7f58eff27 Merge topic 'cuda_check'
e758331595 cm_cxx_features: Remove CUDA installation warning filtering

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4554
2020-04-02 11:15:44 -04:00
Brad King 3667366171 Merge topic 'update-kwsys'
afe8a5eb3f Merge branch 'upstream-KWSys' into update-kwsys
976d29b9bd KWSys 2020-04-01 (25694819)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4556
2020-04-02 11:14:46 -04:00
Brad King 11d43a7ed6 Merge branch 'release-3.16' 2020-04-02 11:13:40 -04:00
Brad King d26f15dfce Merge topic 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.17
81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4557
2020-04-02 11:12:54 -04:00
Brad King 8386407e07 Merge branch 'release-3.17' 2020-04-02 11:12:54 -04:00
Brad King 35d9ca268b Merge topic 'FindPython-fix-VIRTUALENV-eq-FIRST'
81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4557
2020-04-02 11:12:54 -04:00
Ben Boeckel 2c4bb705e8 ExternalProject: allow DOWNLOAD_NO_EXTRACT OFF
Fixes: #20531
2020-04-02 08:55:04 -04:00
Kitware Robot af138785e2 CMake Nightly Date Stamp 2020-04-02 00:01:11 -04:00
Brad King cd5a320d68 Merge branch 'upstream-nghttp2' into curl-http2
# By nghttp2 upstream
* upstream-nghttp2:
  nghttp2 2019-11-15 (cc05c5fe)
2020-04-01 13:30:31 -04:00
nghttp2 upstream 5dc6921805 nghttp2 2019-11-15 (cc05c5fe)
Code extracted from:

    https://github.com/nghttp2/nghttp2.git

at commit cc05c5fe8cfc8287ddc4930fa9684af878d9e631 (v1.40.0).
2020-04-01 13:30:29 -04:00
Brad King 1b8e2c2a3d nghttp2: Add script to import from upstream 2020-04-01 13:30:22 -04:00
Kyle Edwards 0f76839bc7 Help: Discourage direct use of cmake_install.cmake
Encourage people to use cmake(1) --install instead.
2020-04-01 11:39:28 -04:00
Vitaly Stakhovsky aba23c747b cmMakefile::GetProperty: return cmProp 2020-04-01 10:56:34 -04:00
Brad King ff02a592bc cmLocalGenerator: Avoid using upper-case config when not necessary
Calls to `GetLinkerLanguage`, `GetSourceFiles`, etc. can accept
the original-case config name.
2020-04-01 10:56:00 -04:00
Brad King a4b76c237d cmLocalGenerator: Clarify local variable name in GetTargetFlags 2020-04-01 10:55:59 -04:00
Brad King 25a920e827 cmLocalGenerator: Convert GetStaticLibraryFlags to take original-case config
Move upper-case conversion of the configuration into the implementation.
2020-04-01 10:55:59 -04:00
Brad King cfc92b483f Merge topic 'aux-install-dest'
2642f432ef Aux: Install editor and bash files to more natural locations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4548
2020-04-01 10:54:44 -04:00
Brad King f9be12707f Merge topic 'relax_compiler_prefix_detection'
c5dd2ca538 DetermineCompiler: Relax _CMAKE_TOOLCHAIN_PREFIX detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4547
2020-04-01 10:53:46 -04:00
Brad King 221b046ad3 Merge topic 'cmprop-target'
3eec21a01c cmTarget::GetProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4546
2020-04-01 10:52:39 -04:00
Brad King 88507b1d51 Merge branch 'release-3.17' 2020-04-01 10:43:25 -04:00
Brad King 4e69c9d8d8 Merge topic 'cpack-nsis-version'
aa78a2537c CPack/NSIS: Document and check requirement of at least NSIS 3.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4552
2020-04-01 10:43:25 -04:00
Brad King d68794a707 Merge topic 'cpack-nsis-version' into release-3.17
aa78a2537c CPack/NSIS: Document and check requirement of at least NSIS 3.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4552
2020-04-01 10:43:24 -04:00