mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 13:50:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
51,731 Commits 2 Branches 401 Tags
4cd23c5e0d5835781b95f6eda778a35d2f55beb8
Commit Graph

51731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 4cd23c5e0d Merge topic 'issue-17634' 
5af38a11ce try_run: Allow to set working directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5757
 2021-02-04 08:22:19 -05:00
Brad King bf6e655031 Merge topic 'bootstrap-include-check-ldflags' 
11260f6c20 bootstrap: add cmake_ld_flags to include check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5770
 2021-02-04 08:21:23 -05:00
Brad King b2a477e023 Merge topic 'update-curl' 
24f3388fa4 curl: Set build options the way we need for CMake
426ef61cc8 Merge branch 'upstream-curl' into update-curl
076b3219f5 curl 2021-02-03 (2f33be81)
0341888c00 curl: Update script to get curl 7.75.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5767
 2021-02-04 08:20:26 -05:00
Brad King f41c7e1ce7 Merge branch 'release-3.19' 2021-02-04 08:19:17 -05:00
Brad King f82fb91382 Merge topic 'FindBoost-1.75' 
8293064760 FindBoost: Add support for Boost 1.75

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5768
 2021-02-04 08:19:17 -05:00
Brad King 7a76b4b19d Merge topic 'FindBoost-1.75' into release-3.19 
8293064760 FindBoost: Add support for Boost 1.75

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5768
 2021-02-04 08:19:16 -05:00
Brad King b1fe08a4b4 Merge branch 'release-3.19' 2021-02-04 08:18:21 -05:00
Brad King e8ae5d1c32 Merge topic 'xcode-framework-path' 
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
 2021-02-04 08:18:21 -05:00
Brad King 7b9ea201fc Merge topic 'xcode-framework-path' into release-3.19 
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
 2021-02-04 08:18:20 -05:00
Kitware Robot 388ffeb586 CMake Nightly Date Stamp 2021-02-04 00:01:14 -05:00
Issam E. Maghni 11260f6c20 bootstrap: add cmake_ld_flags to include check 2021-02-03 13:36:45 -05:00
Brad King 8293064760 FindBoost: Add support for Boost 1.75 
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
 2021-02-03 12:10:40 -05:00
Brad King 24f3388fa4 curl: Set build options the way we need for CMake 2021-02-03 11:58:10 -05:00
Brad King 426ef61cc8 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2021-02-03 (2f33be81)
 2021-02-03 11:55:06 -05:00
Curl Upstream 076b3219f5 curl 2021-02-03 (2f33be81) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 2f33be817cbce6ad7a36f27dd7ada9219f13584c (curl-7_75_0).
 2021-02-03 11:49:32 -05:00
Brad King 0341888c00 curl: Update script to get curl 7.75.0 2021-02-03 11:49:23 -05:00
Brad King c28dbd7e30 Merge topic 'intel-llvm-compilers' 
a552487843 Help: Clarify release note for IntelLLVM compiler support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5758
 2021-02-03 11:11:25 -05:00
Brad King ff7ca0f831 Merge branch 'release-3.19' 2021-02-03 10:51:29 -05:00
Brad King 8a131c92a4 Merge topic 'findcudatoolkit_env_path' 
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
 2021-02-03 10:51:29 -05:00
Brad King c131afc190 Merge topic 'findcudatoolkit_env_path' into release-3.19 
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
 2021-02-03 10:51:28 -05:00
Brad King a24679e9f3 Merge topic 'pch-reuse-from-obj-msvc' 
c450d66daa PCH: Remove restrictions for REUSE_FROM signature for MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5765
 2021-02-03 10:47:38 -05:00
Brad King afda647ac3 Merge topic 'file-configure-endl' 
05f16ca7ee file(CONFIGURE): Use text mode for default OUTPUT content

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Asit Dhal <dhal.asitk@gmail.com>
Merge-request: !5762
 2021-02-03 10:45:52 -05:00
Brad King 8c10d98daf Merge topic 'cmake-compile-on-iOS' 
30360cb05f iOS: Fix compilation of CMake itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5753
 2021-02-03 10:42:42 -05:00
Brad King 6e9634cb93 Merge topic 'update-kwsys' 
7d46310cf8 Merge branch 'upstream-KWSys' into update-kwsys
86ecce2072 KWSys 2021-02-02 (c672435e)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5763
 2021-02-03 10:41:55 -05:00
Robert Maynard 4ea6d3c3ae FindCUDAToolkit: Restore use of CUDA_PATH environment variable 
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
 2021-02-03 10:35:21 -05:00
Craig Scott 5389bb4274 Xcode: Don't hard-code SDK-provided implicit framework search paths 
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.
ce2dee9e5b (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
 2021-02-03 23:11:21 +11:00
Craig Scott df08f8df30 cmComputeLinkInformation: Fix misspelt private variable name 2021-02-03 23:10:08 +11:00
Asit Dhal 5af38a11ce try_run: Allow to set working directory 
Fixes: #17634
 2021-02-03 08:42:05 +01:00
Kitware Robot af695cee73 CMake Nightly Date Stamp 2021-02-03 00:03:21 -05:00
Brad King 375b307bae Apple: Fix linking to frameworks that do not exist until build time 
Fixes: #21621
 2021-02-03 10:08:48 +11:00
Cristian Adam c450d66daa PCH: Remove restrictions for REUSE_FROM signature for MSVC 
Fixes: #20201
 2021-02-02 15:03:55 -05:00
Brad King 9e2e96f5ad Merge topic 'revert-pch-reuse-from-obj-msvc' 
8d379e7406 Revert "PCH: Remove restrictions for REUSE_FROM signature for MSVC"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5764
 2021-02-02 15:03:18 -05:00
Brad King 8d379e7406 Revert "PCH: Remove restrictions for REUSE_FROM signature for MSVC" 
This reverts commit 9f06097141.
It was merged accidentally.
 2021-02-02 15:02:08 -05:00
Brad King 7cbaf6d87a Merge topic 'pch-reuse-from-obj-msvc' 
9f06097141 PCH: Remove restrictions for REUSE_FROM signature for MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Rejected-by: Cristian Adam <cristian.adam@gmail.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !5728
 2021-02-02 15:00:25 -05:00
Brad King a552487843 Help: Clarify release note for IntelLLVM compiler support 
Update the release note added by commit b9f945eccb (Help: Add release
note for IntelLLVM compiler support, 2021-01-29) to distinguish between
the Intel oneAPI NextGen and Classic compilers.

Co-Author: William R. Dieter <william.r.dieter@intel.com>
Suggested-by: Michael Hirsch, Ph.D <michael@scivision.dev>
 2021-02-02 13:30:09 -05:00
Cristian Adam 9f06097141 PCH: Remove restrictions for REUSE_FROM signature for MSVC 
Fixes: #20201
 2021-02-02 19:11:44 +01:00
Brad King 7d46310cf8 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-02-02 (c672435e)
 2021-02-02 09:37:05 -05:00
KWSys Upstream 86ecce2072 KWSys 2021-02-02 (c672435e) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit c672435eba0d5b024117cd4f30d8d2ed57f7f338 (master).

Upstream Shortlog
-----------------

Brad King (1):
      6e51fe76 FStream: Add std::fstream wrapper for in/out file streams
 2021-02-02 09:37:04 -05:00
Cristian Adam 05f16ca7ee file(CONFIGURE): Use text mode for default OUTPUT content 
This affects only Windows where \n will be translated as \r\n

Fixes: #21769
 2021-02-02 15:18:48 +01:00
Brad King 8387aa20f2 Merge topic 'issue-19198' 
255df8622b file(GENERATE): Support new line style

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5649
 2021-02-02 08:53:07 -05:00
Brad King 193cba5d92 Merge topic 'doc-user-interaction-ClangCL' 
c16509907c Help: Update to VS ClangCL toolset in user-interaction example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5756
 2021-02-02 08:50:30 -05:00
Brad King 7b38688e22 Merge topic 'fix21727_for_FindOpenSSL' 
bc00cf9300 FindOpenSSL: Add support for version-range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5750
 2021-02-02 08:49:44 -05:00
Brad King 932b45ceb9 Merge topic 'shlibdeps-fixup' 
1aefa86c31 Tests: Accept line breaks in more places in dpkg-shlibdeps error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5751
 2021-02-02 08:49:00 -05:00
Brad King 1b5f4a615b Merge topic 'tests-setgid' 
8213390a3e Added `SETUID` and `SETGID` to the list of accepted file permissions
f41d0e0c77 Tests: Explicitly set permissions in CPack tests to avoid perimssions errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5754
 2021-02-02 08:47:55 -05:00
Brad King b8e3c821fe Merge topic 'bad-dns-no_proxy' 
c0b1f5f30c Tests: Add host to ENV{no_proxy} when DNS lookup failure is expected

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5752
 2021-02-02 08:47:01 -05:00
Hayden 30360cb05f iOS: Fix compilation of CMake itself 
There are no ApplicationServices on iOS.
 2021-02-02 08:45:11 -05:00
Kitware Robot 3e76fe7354 CMake Nightly Date Stamp 2021-02-02 00:01:14 -05:00
william.r.dieter 1aefa86c31 Tests: Accept line breaks in more places in dpkg-shlibdeps error message 
The RunCPackVerifyResult-shlibdeps-with-private-lib-failure test failed
intermittently due to sometimes breaking lines in its output in different
places.  This change accepts line breaks in more places in the command
output.

Signed-off-by: william.r.dieter <william.r.dieter@intel.com>
 2021-02-01 10:32:51 -05:00
Tim Hutton c16509907c Help: Update to VS ClangCL toolset in user-interaction example 
As of VS 2019 the toolset is now called `ClangCL`.  The toolset `LLVM`
is no longer supported.

Issue: #20415
 2021-02-01 10:21:03 -05:00
Brad King a28bb8de23 Merge topic 'file-configure-newline' 
6e225efd8c file(CONFIGURE): Fix newlines in CONTENT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5747
 2021-02-01 10:06:27 -05:00