mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 05:10:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
46,773 Commits 2 Branches 401 Tags
bbb3de909dff1332a29b74bba84ce0065bcfda15
Commit Graph

46773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King bbb3de909d Merge topic 'ExternalProject-submodules-recurse' 
0ba8010255 ExternalProject: Fix git submodule recursion on update

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4346
 2020-02-11 08:26:35 -05:00
Brad King f548e4bf60 Merge branch 'release-3.17' 2020-02-11 08:22:49 -05:00
Brad King d5fd396110 Merge topic 'FindOpenMP-clang-windows' 
ceb5ee4a7b FindOpenMP: Add support for Clang on Windows
2dbff623f9 FindOpenMP: Save flags/libs in cache entries each time they are detected

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4327
 2020-02-11 08:22:49 -05:00
Brad King 00cd7269e1 Merge topic 'FindOpenMP-clang-windows' into release-3.17 
ceb5ee4a7b FindOpenMP: Add support for Clang on Windows
2dbff623f9 FindOpenMP: Save flags/libs in cache entries each time they are detected

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4327
 2020-02-11 08:22:49 -05:00
Brad King 5c81c72747 Merge branch 'release-3.17' 2020-02-11 08:21:07 -05:00
Brad King 29423cde11 Merge topic 'FindPython-reduce-resources-comsumption' 
3dab4682f6 FindPython: reduces consumption of resources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4338
 2020-02-11 08:21:07 -05:00
Brad King bdd4fb32ad Merge topic 'FindPython-reduce-resources-comsumption' into release-3.17 
3dab4682f6 FindPython: reduces consumption of resources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4338
 2020-02-11 08:21:06 -05:00
Brad King d022c3aa84 Merge branch 'release-3.17' 2020-02-11 08:20:03 -05:00
Brad King 8e39e0c3e3 Merge topic 'swift-no-sdk-include' into release-3.17 
5c2a92f44f Swift: Exclude SDK include paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4315
 2020-02-11 08:20:03 -05:00
Brad King 961d932a1b Merge topic 'swift-no-sdk-include' 
5c2a92f44f Swift: Exclude SDK include paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4315
 2020-02-11 08:20:03 -05:00
Brad King 9ac2001e37 Merge branch 'release-3.17' 2020-02-11 08:17:46 -05:00
Brad King 783f4720f5 Merge topic 'FindMPI-fix-rerun' into release-3.17 
b4d5ea8233 FindMPI: Preserve order of include directories on re-runs of CMake
8261ee3a9c FindMPI: Restore re-construction of include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4341
 2020-02-11 08:17:45 -05:00
Brad King a63f1c5c03 Merge topic 'FindMPI-fix-rerun' 
b4d5ea8233 FindMPI: Preserve order of include directories on re-runs of CMake
8261ee3a9c FindMPI: Restore re-construction of include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4341
 2020-02-11 08:17:45 -05:00
Brad King 31b2cc6187 Merge topic 'rel-test-python' 
7253b49ca9 Utilities/Release: Use python 3 for tests on Windows binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4339
 2020-02-11 08:16:38 -05:00
Brad King bdc04fd33a Merge topic 'fileapi-test-breakup' 
75e71263e7 FileAPI test: Break gen_check_projects() into JSON files
a0de350e2f FileAPI test: Break gen_check_targets() into JSON files
de8ebc9dba FileAPI test: Break gen_check_directories() into JSON files
1605fcbbd9 FileAPI test: Add infrastructure for reading JSON test data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4333
 2020-02-11 08:15:49 -05:00
Kitware Robot d31f31714b CMake Nightly Date Stamp 2020-02-11 00:01:09 -05:00
Charis Marangos 0ba8010255 ExternalProject: Fix git submodule recursion on update 
In commit 5bc6230741 (ExternalProject: Option to turn off recursive
update of git submodules, 2019-10-16) we implemented the feature in the
clone script written by `_ep_write_gitclone_script` but not in the
update script written by `_ep_write_gitupdate_script`.  Implement the
latter by factoring out a common helper to use in both places.

Fixes: #20335
 2020-02-11 10:14:42 +11:00
Tim Hutton ceb5ee4a7b FindOpenMP: Add support for Clang on Windows 
Fixes: #19404
 2020-02-10 17:20:19 -05:00
Tim Hutton 2dbff623f9 FindOpenMP: Save flags/libs in cache entries each time they are detected 2020-02-10 17:20:19 -05:00
Brad King b4d5ea8233 FindMPI: Preserve order of include directories on re-runs of CMake 
The fix in commit 5861c6d450 (FindMPI: Preserve include order when
extracting component directories, 2019-12-19) only works on the first
run of CMake in which we find MPI.  Extend the fix to save the compiler
wrapper's entire include path in our cache without splitting anything
out.  That way we can preserve the order when CMake re-runs.

Fixes: #20338
 2020-02-10 11:14:42 -05:00
Brad King 8261ee3a9c FindMPI: Restore re-construction of include directories 
The fix in commit 5861c6d450 (FindMPI: Preserve include order when
extracting component directories, 2019-12-19) only works on the first
run of CMake in which we find MPI.  It preserves the include directories
on the first run but still splits them up and saves the pieces in the
cache.  On future runs the pieces are not re-assembled, and we do not
know the order anyway.

Restore the re-assembly step so that at least all the include dirs are
available.  Leave preservation of the original order to later work.

Issue: #20338
 2020-02-10 11:10:29 -05:00
Brad King ce0b40a4bb Merge branch 'release-3.17' 2020-02-10 10:39:49 -05:00
Brad King 205293d7eb Merge topic 'ninja-multi-depfile' 
67102d3252 Ninja Multi-Config: Add support for DEPFILE option in add_custom_command()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4334
 2020-02-10 10:39:49 -05:00
Brad King 35e9fbec0b Merge topic 'ninja-multi-depfile' into release-3.17 
67102d3252 Ninja Multi-Config: Add support for DEPFILE option in add_custom_command()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4334
 2020-02-10 10:39:48 -05:00
Yauheni Khnykin 5c2a92f44f Swift: Exclude SDK include paths 
Populate `CMAKE_Swift_IMPLICIT_INCLUDE_DIRECTORIES` with the macOS SDK's
include directory so that we filter such implicit directories out of
Swift targets.

Fixes: #19845
 2020-02-10 10:32:37 -05:00
Brad King 7253b49ca9 Utilities/Release: Use python 3 for tests on Windows binaries 
Explicitly specify the build machine's Python 3 installation for
Windows to be used by the test suite.  This avoids accidentally
using other versions on the machine.
 2020-02-10 10:19:20 -05:00
Marc Chevrier 3dab4682f6 FindPython: reduces consumption of resources 
Stores more information in the cache to reduce the number
of sub-processes required on subsequent find_package calls.

Fixes: #20337
 2020-02-10 12:41:04 +01:00
Kitware Robot 799bfb7132 CMake Nightly Date Stamp 2020-02-10 00:01:07 -05:00
Kitware Robot cb967317e4 CMake Nightly Date Stamp 2020-02-09 00:01:05 -05:00
Kitware Robot f77f64f793 CMake Nightly Date Stamp 2020-02-08 00:01:08 -05:00
Kyle Edwards 67102d3252 Ninja Multi-Config: Add support for DEPFILE option in add_custom_command() 
And give other generators a path forward to add support in the future.
 2020-02-07 14:18:54 -05:00
Kyle Edwards 75e71263e7 FileAPI test: Break gen_check_projects() into JSON files 2020-02-07 13:42:20 -05:00
Kyle Edwards a0de350e2f FileAPI test: Break gen_check_targets() into JSON files 2020-02-07 13:37:15 -05:00
Kyle Edwards de8ebc9dba FileAPI test: Break gen_check_directories() into JSON files 2020-02-07 11:17:23 -05:00
Kyle Edwards 1605fcbbd9 FileAPI test: Add infrastructure for reading JSON test data 2020-02-07 10:58:10 -05:00
Brad King 3844e2ae4c Merge topic 'cmake-gui-env-platform-defaults' 
9a71fa46e7 cmake-gui: set generator field defaults from environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4312
 2020-02-07 10:37:35 -05:00
Brad King c1651ae251 Merge branch 'release-3.16' 2020-02-07 10:26:19 -05:00
Brad King 1cc457873d Merge branch 'release-3.17' 2020-02-07 10:23:45 -05:00
Brad King b428224867 Merge topic 'libarchive-win-codepage' 
16e31523ba libarchive: Add support for UTF-8 locale on Windows
f7c54d2049 libarchive: Fix WideCharToMultiByte output buffer size

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4332
 2020-02-07 10:23:45 -05:00
Brad King ad17c37d34 Merge topic 'libarchive-win-codepage' into release-3.17 
16e31523ba libarchive: Add support for UTF-8 locale on Windows
f7c54d2049 libarchive: Fix WideCharToMultiByte output buffer size

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4332
 2020-02-07 10:23:44 -05:00
Brad King fe8017892e Merge branch 'release-3.17' 2020-02-07 09:26:37 -05:00
Brad King 4e44cbc673 Merge topic 'ninja-multi-default-config-fix' 
1844be451e Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4331
 2020-02-07 09:26:37 -05:00
Brad King 135378fd18 Merge topic 'ninja-multi-default-config-fix' into release-3.17 
1844be451e Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4331
 2020-02-07 09:26:36 -05:00
Brad King b3fd1bcfa5 Merge branch 'release-3.17' 2020-02-07 09:17:27 -05:00
Brad King 92faf1aeb4 Merge topic 'ninja-multi-no-minsizerel' into release-3.17 
9e219de4fb Ninja Multi-Config: Don't include MinSizeRel by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4326
 2020-02-07 09:17:26 -05:00
Brad King 6c142ac7aa Merge topic 'ninja-multi-no-minsizerel' 
9e219de4fb Ninja Multi-Config: Don't include MinSizeRel by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4326
 2020-02-07 09:17:26 -05:00
Brad King 737ca8e016 Merge branch 'release-3.17' 2020-02-07 09:15:46 -05:00
Brad King 24e0781c51 Merge topic 'cuda_toolkit_add_cupti' 
27b0d908d4 CUDAToolkit: Add support for cupti library
c3d7f2e43b CUDAToolkit: Correct location of OpenCL doc link

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4329
 2020-02-07 09:15:46 -05:00
Brad King 6d7d0d2446 Merge topic 'cuda_toolkit_add_cupti' into release-3.17 
27b0d908d4 CUDAToolkit: Add support for cupti library
c3d7f2e43b CUDAToolkit: Correct location of OpenCL doc link

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4329
 2020-02-07 09:15:45 -05:00
Kitware Robot 006aff6f87 CMake Nightly Date Stamp 2020-02-07 00:01:09 -05:00