mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-01 04:03:24 +03:00
Code Activity
47,352 Commits 2 Branches 414 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 31e4d3a8f9 Merge branch 'release-3.16' 2020-02-25 08:56:25 -05:00
Brad King 236ac2b1eb Merge branch 'release-3.15' 2020-02-25 08:56:20 -05:00
Brad King f010073170 Merge branch 'release-3.17' 2020-02-25 08:55:50 -05:00
Brad King 2b615e6f5e Merge topic 'FindPkgConfig-scope' 
c3e0d1ffe9 FindPkgConfig: set policies CMP0054 and CMP0057 to new

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4388
 2020-02-25 08:55:50 -05:00
Brad King 3a6481670f Merge topic 'FindPkgConfig-scope' into release-3.17 
c3e0d1ffe9 FindPkgConfig: set policies CMP0054 and CMP0057 to new

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4388
 2020-02-25 08:55:49 -05:00
Brad King 078b902dfb Merge branch 'release-3.17' 2020-02-25 08:54:45 -05:00
Brad King 1d338dcf46 Merge topic 'cuda-non-device-link' into release-3.17 
7da2c8c543 Merge branch 'backport-cuda-non-device-link'
738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4376
 2020-02-25 08:54:45 -05:00
Brad King 64ed4f6f99 Merge topic 'cuda-non-device-link' 
7da2c8c543 Merge branch 'backport-cuda-non-device-link'
738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4376
 2020-02-25 08:54:45 -05:00
Kitware Robot 2fb84a9352 CMake Nightly Date Stamp 2020-02-25 00:01:09 -05:00
Kyle Edwards a5be3916ee CTest: Provide more detailed information on resource allocation error 2020-02-24 15:44:01 -05:00
Kyle Edwards f0df3ed5b9 Refactor: Provide more detailed error information from TryAllocateResources() 2020-02-24 15:44:01 -05:00
Kyle Edwards f1c34443b7 CTest: Improve error reporting with bad working directory for tests 2020-02-24 15:44:01 -05:00
Kyle Edwards 1dec359422 Refactor: Require detail when calling cmCTestRunTest::StartFailure() 2020-02-24 15:44:01 -05:00
Brad King ede4497cb2 Merge branch 'FindPkgConfig-scope' into release-3.16 
Merge-request: !4388
 2020-02-24 14:45:34 -05:00
Sarang Joshi c0534c4a68 CPackRPM: Add PRE_/POST_TRANS scripts 
Add variables for PRE_TRANS and POST_TRANS scripts.

Fixes: #18917
 2020-02-24 14:31:38 -05:00
Robert Maynard b9d67447c3 FindCUDA: Only depend on Threads::Threads on platforms that need it 
In commit 46371132b3 (FindCUDA: CUDA_LIBRARIES doesn't contain raw
`-pthread`, 2019-11-11, v3.17.0-rc1~455^2) we introduced use of the
`Threads::Threads` target, but we do not `find_package(Threads)` on all
platforms.  Use the target only if it exists.
 2020-02-24 14:14:38 -05:00
Matthäus G. Chajdas 9078101d75 FindOpenCL: Add more paths on 64-bit Linux 
Add additional search paths for OpenCL on 64-bit Linux.

Fixes: #20084
 2020-02-24 14:07:28 -05:00
Brad King 0aa91f9a66 Merge branch 'backport-cuda-non-device-link' into release-3.16 
Merge-request: !4376
 2020-02-24 13:36:24 -05:00
Brad King 553c454477 Merge branch 'backport-cuda-non-device-link' into release-3.15 
Merge-request: !4376
 2020-02-24 13:35:51 -05:00
Brad King 7da2c8c543 Merge branch 'backport-cuda-non-device-link' 2020-02-24 13:34:13 -05:00
Francisco Facioni 738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools 
Since commit d91b5a72cd (Ninja: Add support for CUDA nvcc response
files, 2019-05-30, v3.15.0-rc1~8^2) we use NVCC's `--options-file`
option to avoid long link command lines via a response file.  However,
for non-device linking the host tools are used and the option does not
make sense.  Update the logic to use `--options-file` only for device
linking.  Linking with the host tools already has its own logic for
response files.

Fixes: #19954
 2020-02-24 13:31:33 -05:00
Brad King 8d6ea4401c Merge topic 'pch-create-via-include' into release-3.17 
5c6d6ec27c PCH: Clang: Update PCH usage flags to include original header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4360
 2020-02-24 13:12:08 -05:00
Brad King f1b404d92e Merge branch 'release-3.17' 2020-02-24 13:12:08 -05:00
Brad King 41a12d3df0 Merge topic 'pch-create-via-include' 
5c6d6ec27c PCH: Clang: Update PCH usage flags to include original header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4360
 2020-02-24 13:12:08 -05:00
Seth R Johnson a1909e26ac UseSWIG: Enable SWIG Fortran target language 2020-02-24 12:15:48 -05:00
Brad King 592ce3e89b Merge branch 'upstream-bzip2' into update-bzip2 
# By bzip2 upstream
* upstream-bzip2:
  bzip2 2019-07-13 (6a8690fc)
 2020-02-24 12:11:59 -05:00
bzip2 upstream 03e9d5afb3 bzip2 2019-07-13 (6a8690fc) 
Code extracted from:

    https://sourceware.org/git/bzip2.git

at commit 6a8690fc8d26c815e798c588f796eabe9d684cf0 (bzip2-1.0.8).
 2020-02-24 12:11:59 -05:00
Brad King 39f2a9b286 bzip2: Update import script to get bzip2 1.0.8 2020-02-24 12:11:30 -05:00
Brad King 35acaa90c5 bzip2: Add compilation flags to disable warnings in third-party code 2020-02-24 12:10:07 -05:00
Brad King 3d47b0ae97 Merge branch 'upstream-bzip2' into update-bzip2 
# By bzip2 upstream
* upstream-bzip2:
  bzip2 2007-12-10 (a1d78c55)
 2020-02-24 12:06:04 -05:00
bzip2 upstream 05c3d1bcdb bzip2 2007-12-10 (a1d78c55) 
Code extracted from:

    https://sourceware.org/git/bzip2.git

at commit a1d78c550180bde11af6c559a01721c962f9f231 (bzip2-1.0.5).
 2020-02-24 12:06:02 -05:00
Brad King 2c40844891 bzip2: Remove all sources to make room for fresh import 2020-02-24 12:05:51 -05:00
Brad King 09ab19a696 bzip2: add script to import bzip2 from upstream 2020-02-24 11:58:07 -05:00
Sergey Larin 5c6d6ec27c PCH: Clang: Update PCH usage flags to include original header 
Add an additional include flag to PCH usage command line to fix programs
that rely on `compile_commands.json` file. Pass it to the preprocessor
directly to avoid compiler driver to change it to '-include-pch'.

When preprocessor is requested to preprocess a file, it tries to get
the original filename from '.pch' and uses that file for preprocessing.
CMake generates a '.pch' file from the '.hxx' file by passing an empty
'.cxx' source file to the compiler as a compilation unit and the header
file with the '-include' flag. After that, compiler puts compilation
unit filename in the '.pch' as the original filename.

However, CMake build system uses empty file as the source file and
passes the header file using '-include-pch' flag. As a result, Clang
uses the wrong file for preprocessing and produces the corrupted
preprocessed file.

Fixes: #20355
Signed-off-by: Sergey Larin <cerg2010cerg2010@mail.ru>
 2020-02-24 10:53:39 -05:00
Rolf Eike Beer c3e0d1ffe9 FindPkgConfig: set policies CMP0054 and CMP0057 to new 
One may encounter warnings if FindPkgConfig is used in any project, even
indirectly, that has set any of these policies to old explicitely or requires
an older version.
 2020-02-24 16:42:34 +01:00
Cristian Adam 6ec274b002 execute_process: Add ECHO_(OUTPUT|ERROR)_VARIABLE options 
Fixes: #20378
 2020-02-24 14:44:14 +01:00
Craig Scott 21d72777fb Merge topic 'ctest-resource-allocation-doc' 
d966634b60 Help: Clarify that the CTest resource allocation feature doesn't oversubscribe

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4382
 2020-02-24 04:13:06 -05:00
Kitware Robot 5fa6f8192e CMake Nightly Date Stamp 2020-02-24 00:01:05 -05:00
Kitware Robot 3671a928d0 CMake Nightly Date Stamp 2020-02-23 00:01:05 -05:00
Kitware Robot bdeda3691b CMake Nightly Date Stamp 2020-02-22 00:01:06 -05:00
Kyle Edwards d966634b60 Help: Clarify that the CTest resource allocation feature doesn't oversubscribe 2020-02-21 08:46:02 -05:00
Kitware Robot 25ca8e5ce5 CMake Nightly Date Stamp 2020-02-21 00:01:11 -05:00
Joachim Wuttke (o) 1af49def54 Help: CPackIFW generator: offline installer 
Bundle subsections under "Other Settings".
Improve explanation of the Online installer.
 2020-02-20 20:25:34 +01:00
Kyle Edwards 1f44c5ed65 Merge topic 'string-hex' 
97b639d3f1 Help: Make note that file(READ ... HEX) produces lowercase letters
5395bf05eb string: Add new HEX sub-command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4373
 2020-02-20 11:51:51 -05:00
Kitware Robot 907ffbf52e CMake Nightly Date Stamp 2020-02-20 00:01:08 -05:00
Kyle Edwards 97b639d3f1 Help: Make note that file(READ ... HEX) produces lowercase letters 2020-02-19 09:11:15 -05:00
Kyle Edwards 5395bf05eb string: Add new HEX sub-command 2020-02-19 09:11:05 -05:00
Kitware Robot 952945813c CMake Nightly Date Stamp 2020-02-19 00:01:16 -05:00
Brad King 8625ffd939 Merge branch 'release-3.17' 2020-02-18 11:49:01 -05:00
Brad King fe564f3131 Merge topic 'update-kwsys' into release-3.17 
ce59cabc70 KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursion

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4361
 2020-02-18 11:49:00 -05:00