mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-17 17:21:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
49,967 Commits 2 Branches 394 Tags
b6418155f35ce997eb9f252f63751d76ff7342bf
Commit Graph

49967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Maynard
b6418155f3 cmGeneratorTarget: Include Cache now occurs per language+config 
Previously only occurred per config which broke per-language
system includes.
 2020-09-25 14:00:06 -04:00
Kitware Robot
0cd1ef0932 CMake Nightly Date Stamp 2020-09-25 00:01:17 -04:00
Brad King
c98ec731f9 Merge topic 'update-libuv' 
7a0506bafe libuv: Suppress conversion warning on Windows
2269ad6a0a libuv: Add fs_copy stub to cmake-bootstrap.c
e21325c2c6 Merge branch 'upstream-libuv' into update-libuv
c1463f959f libuv 2020-09-22 (ed5b42d5)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5259
 2020-09-24 15:16:28 -04:00
Brad King
0436f70f80 Merge topic 'zstd-1.4.5' 
2ca54e7179 zstd: version 1.4.5 update
0b3e9259dd Merge branch 'upstream-zstd'
4676ad8c32 zstd 2020-05-21 (b706286a)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5260
 2020-09-24 15:15:55 -04:00
Brad King
0ff74958f4 Merge topic 'cmake-gui-tests' 
1dcc569828 gitlab-ci: Add GUI testing to each OS
4c6e5cd0fa Tests: Add some basic tests for CMake GUI
41e223deb3 CMake GUI: Split up into libraries, add test shim
b7995b62f0 QCMakeCacheView: Default to nullptr for parent

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5224
 2020-09-24 15:15:19 -04:00
Brad King
4ae8cc7f0b Merge topic 'proper_device_libraries_architecture' 
1cd4a37c12 Tests: Use sm_35 in Cuda.ProperDeviceLibraries for CUDA <10.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5261
 2020-09-24 15:14:18 -04:00
Brad King
7b38161ca1 Merge topic 'check-source-modules' 
357e2ef429 CheckSoureRuns: Add a unified way to check if a source runs
10ae907de0 CheckSoureCompiles: Add a unified way to check if a source compiles
f5c928f73c Add a test to verify '\' handling in CHECK_CXX_SOURCE_COMPILES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !5223
 2020-09-24 15:12:59 -04:00
Brad King
9aa93937f9 Merge topic 'obj-lib-per-config-source' 
2f76e7429b OBJECT libraries: Properly recognize if sources depend on configuration
d575ecc9de cmGeneratorTarget: Better name for internal variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5252
 2020-09-24 15:10:04 -04:00
Brad King
4981b509ef Merge branch 'release-3.18' 2020-09-24 15:08:53 -04:00
Brad King
17696a0c32 Merge topic 'FindPython-fix-regex' 
6c094c1c1e FindPython: Fix erroneous regex in ABI check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5257
 2020-09-24 15:08:52 -04:00
Brad King
d031b7b044 Merge topic 'FindPython-fix-regex' into release-3.18 
6c094c1c1e FindPython: Fix erroneous regex in ABI check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5257
 2020-09-24 15:08:52 -04:00
Craig Scott
ac5195c408 Merge topic 'find_package-version-range' 
5b3356263c CMakePackageConfigHelpers: Add version range support
6bfc442fde FPHSA: add support of version range
d7df81067b find_package: Add support of version range
09095dbcd2 cmFindPackageCommand: Refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !5226
 2020-09-24 07:29:03 -04:00
Kitware Robot
d18c564210 CMake Nightly Date Stamp 2020-09-24 00:01:12 -04:00
Brad King
d787dd2277 Merge topic 'intel-dpcpp' 
887f3a88a6 Intel: Add Intel DPC++ compiler identification

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5255
 2020-09-23 15:13:01 -04:00
Raul Tambre
1cd4a37c12 Tests: Use sm_35 in Cuda.ProperDeviceLibraries for CUDA <10.0 
Using the cublas device libraries seems to require at least sm_35.
Set the architecture explicitly to sm_35 for old CUDA versions, which still
have the cublas device library.
 2020-09-23 21:29:21 +03:00
Kyle Edwards
1dcc569828 gitlab-ci: Add GUI testing to each OS 2020-09-23 14:10:40 -04:00
Kyle Edwards
4c6e5cd0fa Tests: Add some basic tests for CMake GUI 2020-09-23 14:10:40 -04:00
Kyle Edwards
41e223deb3 CMake GUI: Split up into libraries, add test shim 2020-09-23 14:10:40 -04:00
Kyle Edwards
b7995b62f0 QCMakeCacheView: Default to nullptr for parent 2020-09-23 14:10:40 -04:00
Cristian Adam
2ca54e7179 zstd: version 1.4.5 update 
Add source files needed to properly compile / link to zstd
version 1.4.5
 2020-09-23 19:09:16 +02:00
Cristian Adam
0b3e9259dd Merge branch 'upstream-zstd' 
# By zstd upstream
* upstream-zstd:
  zstd 2020-05-21 (b706286a)
 2020-09-23 18:49:33 +02:00
zstd upstream
4676ad8c32 zstd 2020-05-21 (b706286a) 
Code extracted from:

    https://github.com/facebook/zstd.git

at commit b706286adbba780006a47ef92df0ad7a785666b6 (v1.4.5).
 2020-09-23 18:49:32 +02:00
Brad King
7a0506bafe libuv: Suppress conversion warning on Windows 
Add a cast to avoid the conversion warning with minimal changes to
third-party code.
 2020-09-23 12:32:54 -04:00
Brad King
2269ad6a0a libuv: Add fs_copy stub to cmake-bootstrap.c 
This is now called by `uv__fs_sendfile` in `src/unix/fs.c` but we do not
need that feature during CMake bootstrap.
 2020-09-23 12:28:48 -04:00
Robert Maynard
357e2ef429 CheckSoureRuns: Add a unified way to check if a source runs 2020-09-23 12:28:37 -04:00
Robert Maynard
10ae907de0 CheckSoureCompiles: Add a unified way to check if a source compiles 2020-09-23 12:28:37 -04:00
Brad King
e21325c2c6 Merge branch 'upstream-libuv' into update-libuv 
* upstream-libuv:
  libuv 2020-09-22 (ed5b42d5)
 2020-09-23 12:13:59 -04:00
libuv upstream
c1463f959f libuv 2020-09-22 (ed5b42d5) 
Code extracted from:

    https://github.com/libuv/libuv.git

at commit ed5b42d5b70b69f4c84f99e4112233375b17d6a4 (v1.x).
 2020-09-23 12:10:04 -04:00
Robert Maynard
f5c928f73c Add a test to verify '\' handling in CHECK_CXX_SOURCE_COMPILES 2020-09-23 12:05:39 -04:00
Brad King
d827fdb6f9 Merge topic 'separate_arguments-program' 
d832c1cc7d separate_arguments: add option PROGRAM
f4c21d4953 separate_arguments: refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5253
 2020-09-23 12:05:26 -04:00
Brad King
a41f375e65 Merge topic 'test-issue-21144' 
e02f677f61 Tests: Add test for early source lookup of file(GENERATE)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5248
 2020-09-23 12:04:37 -04:00
Brad King
c9a3ae1356 Merge topic 'FindProtobuf-threads' 
ae41216878 FindProtobuf: Link to threads dependency only when Protobuf is found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5251
 2020-09-23 11:59:23 -04:00
Brad King
869d6c82a0 Merge topic 'install-EXPORT-source-CONFIG' 
bf114602da install(EXPORT): Fix exporting target w/ source named using CONFIG genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5240
 2020-09-23 11:58:02 -04:00
Brad King
226f6bc615 Merge topic 'cuda_tests_architecture' 
4fe9f534f5 Tests: Don't unnecessarily set CUDA_ARCHITECTURES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5246
 2020-09-23 11:56:34 -04:00
Marc Chevrier
6c094c1c1e FindPython: Fix erroneous regex in ABI check 
A regex added by commit 6fdfe2428d (FindPython: enhance ABI checks
against include directory, 2020-09-02, v3.18.3~17^2) was missing a
backslash.

Fixes: #21223
 2020-09-23 11:37:20 -04:00
Brad King
145730c746 Merge topic 'binary-dir-props' 
f2daa025e3 {get,set}_property: Add support for referencing binary directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5254
 2020-09-23 10:22:56 -04:00
Deniz Bahadir
2f76e7429b OBJECT libraries: Properly recognize if sources depend on configuration 
Fixes: #21198
 2020-09-23 10:05:55 -04:00
Brad King
f2daa025e3 {get,set}_property: Add support for referencing binary directories 
Index directories by their binary directory path in addition to their
source directory path.

Fixes: #19262
 2020-09-23 09:25:42 -04:00
Marc Chevrier
5b3356263c CMakePackageConfigHelpers: Add version range support 2020-09-23 12:52:25 +02:00
Marc Chevier
6bfc442fde FPHSA: add support of version range 2020-09-23 12:52:25 +02:00
Marc Chevier
d7df81067b find_package: Add support of version range 
This enhancement is the first step for solving issue #21107
 2020-09-23 12:52:25 +02:00
Marc Chevrier
09095dbcd2 cmFindPackageCommand: Refactoring 
* Use member initialisation at declaration
* AddFindDefinition: same signature as cmMakefile::AddDefinition for consistency
* Factorise version variables creation
 2020-09-23 12:52:25 +02:00
Kitware Robot
03b3b5ab4b CMake Nightly Date Stamp 2020-09-23 00:01:20 -04:00
Harini Chilamantula
887f3a88a6 Intel: Add Intel DPC++ compiler identification 
The compiler identifies itself with the `__INTEL_DPCPP_COMPILER__`
preprocessor definition.
 2020-09-22 15:20:03 -04:00
Marc Chevrier
d832c1cc7d separate_arguments: add option PROGRAM 
Fixes: #21217
 2020-09-22 16:32:34 +02:00
Marc Chevrier
f4c21d4953 separate_arguments: refactoring 2020-09-22 16:32:34 +02:00
Brad King
0cb7216b9f Merge branch 'release-3.18' into master 2020-09-22 09:56:56 -04:00
Brad King
177fc02073 CMake 3.18.3 v3.18.3 2020-09-22 08:53:09 -04:00
Brad King
ae41216878 FindProtobuf: Link to threads dependency only when Protobuf is found 
Since commit 03454b0d0d (FindProtobuf: Add missing link dependencies on
threads, 2018-10-31, v3.13.0-rc3~10^2) we add the threads library to the
list of libraries needed for Protobuf.  Update the logic to do this only
when a real protobuf library is actually found.

Fixes: #21161
 2020-09-22 08:49:22 -04:00
Brad King
44c5f5d4ec Merge topic 'cmake_path-updates' 
82c9508313 cmake_path: enhancements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5245
 2020-09-22 08:03:51 -04:00