mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-03 04:10:05 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,352 Commits 2 Branches 385 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph

10291 Commits

Author SHA1 Message Date
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
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
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
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
Brad King
084c14d952 Merge topic 'doc-sections' 
22aac6669b Help: install: use bullet lists to sort out target kinds
b3f4d50348 Help: ifw.rst: Add toc; mv "Hints" section -> subsection of "Variables"
c671966c20 Help: CPackComponent: Sectioning and rewording
05e56b1897 Help: FetchContent, ExternalProject: Command sections -> subsections

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4367
 2020-02-18 11:26:27 -05:00
Brad King
b841fdcb9e Merge topic 'CPackNuGet-granular-errors' 
e6c470997f CPack/NuGet: Provide more granular errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !4132
 2020-02-18 11:23:31 -05:00
Brad King
b4971d086f Merge topic 'swift-exe-rpath' 
321df5783d Swift: support `-rpath` for executables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4365
 2020-02-18 11:21:47 -05:00
Brad King
77b537cc35 Merge topic 'swift-exe-rpath' into release-3.17 
321df5783d Swift: support `-rpath` for executables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4365
 2020-02-18 11:21:46 -05:00
Saleem Abdulrasool
321df5783d Swift: support -rpath for executables 
This adjusts the flags to enable setting the RPATH for executables.
 2020-02-17 11:07:40 -05:00
Yacoub Hossain
e6c470997f CPack/NuGet: Provide more granular errors 
Address the problem of not knowing when cpack fails to create a nuget
package which occurs when creating multiple nupkgs.

Fixes: #20094
 2020-02-17 11:01:08 -05:00
Brad King
bf718ccd60 Merge topic 'git-config-with-spaces' into release-3.17 
ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces
40d1d29cfa Tests: Add missing ExternalProject smoke tests
afc8956765 Tests: Fix test_clean target missing some test directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4364
 2020-02-17 10:39:46 -05:00
Brad King
0557e0b866 Merge topic 'git-config-with-spaces' 
ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces
40d1d29cfa Tests: Add missing ExternalProject smoke tests
afc8956765 Tests: Fix test_clean target missing some test directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4364
 2020-02-17 10:39:46 -05:00
Joachim Wuttke (o)
c671966c20 Help: CPackComponent: Sectioning and rewording 
* Insert section and subsection headers (because this is a very long
    doc page)
* In the Introduction, first say that module is included automatically
* Then start with operational definition of components
* Remove duplications
* Also reword the description of the command cpack_add_component
 2020-02-17 16:12:15 +01:00
Joachim Wuttke (o)
05e56b1897 Help: FetchContent, ExternalProject: Command sections -> subsections 2020-02-17 12:15:57 +01:00
Craig Scott
ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces 
Fixes: #20354
 2020-02-15 13:23:56 +11:00
Joachim Wuttke (o)
0ea52ece71 Help: module CPack: improve summary and Introduction 
* In summary:
  * we configure generators, not the generated installers
  * we generate installers or source packages, not source package installers

* In Introduction:
  * Make paragraph on binary installers more concise
  * Remove example that refered to CMake source tree
  * Add paragraph on source packages
  * omit the parenthesis on graphical installers
 2020-02-14 21:49:47 +11:00
Joachim Wuttke (o)
5c4d730dd4 Help: CPackComponent: improve summary and introduction 
Also:
* provide some hyperlinks
* update parenthesis on graphical installers (no longer restricted
  to Win and macOS)
 2020-02-14 21:49:22 +11:00
Brad King
d8daaf0bc3 Merge topic 'doc-ascii' 
c5d7c29137 Help: Replace UTF-8 apostrophe with ascii apostrophe

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4358
 2020-02-12 15:04:41 -05:00
Brad King
c5d7c29137 Help: Replace UTF-8 apostrophe with ascii apostrophe 
Also replace UTF-8 graphical characters with simple dashes.

Fixes: #20349
 2020-02-12 14:37:41 -05:00
Brad King
6f2464b2ed Merge topic 'doc-cpack' into release-3.17 
3af0b33ec6 Help: module CPack: Make internal hyperlink target more unique

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4353
 2020-02-12 10:32:05 -05:00
Brad King
1214e830ea Merge topic 'doc-cpack' 
3af0b33ec6 Help: module CPack: Make internal hyperlink target more unique

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4353
 2020-02-12 10:32:05 -05:00
Brad King
3af0b33ec6 Help: module CPack: Make internal hyperlink target more unique 
We already have a `.. _targets:` in `Help/command/install.rst`.
 2020-02-12 10:28:10 -05:00
Brad King
9c9ed28088 Merge topic 'doc-cpack' into release-3.17 
59e9f33d78 Help: module CPack: New section on targets.
f33708eed9 Help: module CPack: add cross-reference to cpack-generators(7).
4949e1261a Help: module CPack. Explain usage of the build targets.
72eaeb41f5 Help: module CPack: correction: 2 config files are generated, not just 1
c35a9ff9c3 Help: CPack module: Correct the summary (configure, not build)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4352
 2020-02-12 10:01:40 -05:00
Brad King
567458eea4 Merge topic 'doc-cpack' 
59e9f33d78 Help: module CPack: New section on targets.
f33708eed9 Help: module CPack: add cross-reference to cpack-generators(7).
4949e1261a Help: module CPack. Explain usage of the build targets.
72eaeb41f5 Help: module CPack: correction: 2 config files are generated, not just 1
c35a9ff9c3 Help: CPack module: Correct the summary (configure, not build)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4352
 2020-02-12 10:01:40 -05:00
Joachim Wuttke (o)
59e9f33d78 Help: module CPack: New section on targets. 
To explain in full detail to what extent the targets package and
package_source are supported by different generators.
 2020-02-12 09:49:26 -05:00
Brad King
42f77c7f69 Merge topic 'PrintSystemInformation' into release-3.17 
1e9328a00d Help: CMakePrintSystemInformation.cmake: Minor corrections.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4351
 2020-02-12 09:36:12 -05:00
Brad King
2cac4d38c8 Merge topic 'PrintSystemInformation' 
1e9328a00d Help: CMakePrintSystemInformation.cmake: Minor corrections.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4351
 2020-02-12 09:36:12 -05:00
Brad King
9fc86efe4a Merge topic 'cpack-ifw-qt-links' into release-3.17 
e240371ab1 Help: CPackIFWGenerator: explain relation to CPackIWF
78779c6111 Help: Show external link only once per page; explain abbreviation QtIFW.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4348
 2020-02-12 09:35:22 -05:00
Brad King
495f4c717c Merge topic 'cpack-ifw-qt-links' 
e240371ab1 Help: CPackIFWGenerator: explain relation to CPackIWF
78779c6111 Help: Show external link only once per page; explain abbreviation QtIFW.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4348
 2020-02-12 09:35:22 -05:00
Brad King
506ffedf6c Merge topic 'FindHDF5-docs' 
88cffab75f FindHDF5: docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4343
 2020-02-12 09:20:59 -05:00
Joachim Wuttke (o)
f33708eed9 Help: module CPack: add cross-reference to cpack-generators(7). 2020-02-12 13:37:15 +01:00
Joachim Wuttke (o)
4949e1261a Help: module CPack. Explain usage of the build targets. 
Explain the usage of the two new build targets, package and
package_source.
 2020-02-12 13:23:08 +01:00
Joachim Wuttke (o)
72eaeb41f5 Help: module CPack: correction: 2 config files are generated, not just 1 
Besides CPackConfig.cmake, the module also generates CPackSourceConfig.cmake.
 2020-02-12 13:22:51 +01:00
Joachim Wuttke (o)
c35a9ff9c3 Help: CPack module: Correct the summary (configure, not build) 
Including CPack does not "build" installers.
It just *configures* them.
 2020-02-12 12:37:48 +01:00
Joachim Wuttke (o)
1e9328a00d Help: CMakePrintSystemInformation.cmake: Minor corrections. 
Punctuation.
"file" -> "module"
 2020-02-12 12:34:08 +01:00
Michael Hirsch, Ph.D
88cffab75f FindHDF5: docs 
The docs referred to deprecated variables and HDF5_ROOT, which is
implicit for every Find*.
 2020-02-11 11:11:42 -05:00
Joachim Wuttke (o)
e240371ab1 Help: CPackIFWGenerator: explain relation to CPackIWF 
* Make overview more focussed
* Explain the relation to CPackIFW
 2020-02-11 10:47:26 -05:00
Joachim Wuttke (o)
78779c6111 Help: Show external link only once per page; explain abbreviation QtIFW. 2020-02-11 10:47:26 -05:00
Michael Hirsch, Ph.D
659e46b99b FindHDF5: Improve search when not using HDF5 compiler wrapper 
Add common lib/inc path_suffixes.
 2020-02-11 10:42:41 -05:00
Michael Hirsch, Ph.D
d9e39f3f89 FindHDF5: check that compiler wrapper can compile a minimal program 
There are common setups where the compiler wrapper is broken and will
give non-useful flags to CMake.
 2020-02-11 10:42:41 -05:00
Brad King
a55d0c11d6 Merge topic 'ExternalProject-submodules-recurse' into release-3.17 
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
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