mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-12 20:39:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
46,874 Commits 2 Branches 393 Tags
0557e0b866cd07adfa4ddb80dd2fd0d3de10d45b
Commit Graph

46874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brad King
b782fc9390 Merge topic 'makefiles-deep-configure' 
e46e3442fd Makefiles: Re-run CMake if file configured in subdirectory is missing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4359
 2020-02-17 10:26:05 -05:00
Kitware Robot
6d00a2de7b CMake Nightly Date Stamp 2020-02-17 00:01:13 -05:00
Craig Scott
2d1aec3b2c Merge topic 'docs-cpack-typos' 
6a4743b2c3 Help: Correct typos in CPack docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4366
 2020-02-16 17:26:04 -05:00
Joachim Wuttke (h)
6a4743b2c3 Help: Correct typos in CPack docs 2020-02-17 08:20:53 +11:00
Kitware Robot
333a0507c0 CMake Nightly Date Stamp 2020-02-16 00:01:46 -05:00
Craig Scott
c76a719ab1 Merge topic 'doc-cpack' 
0ea52ece71 Help: module CPack: improve summary and Introduction
5c4d730dd4 Help: CPackComponent: improve summary and introduction
40da958d23 Help: CPack Archive Generator: Clarify source vs binary package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4354
 2020-02-15 16:22:45 -05:00
Kitware Robot
8be99c62ea CMake Nightly Date Stamp 2020-02-15 00:01:14 -05:00
Craig Scott
ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces 
Fixes: #20354
 2020-02-15 13:23:56 +11:00
Craig Scott
40d1d29cfa Tests: Add missing ExternalProject smoke tests 2020-02-15 13:23:46 +11:00
Craig Scott
afc8956765 Tests: Fix test_clean target missing some test directories 2020-02-15 13:23:37 +11:00
Brad King
b78213e30b Merge topic 'update-libarchive' 
b83d96f164 libarchive: Update to build within CMake
5d8b3aec0c Merge branch 'upstream-LibArchive' into update-libarchive
8cce62295a LibArchive 2020-02-11 (3288ebb0)
9a27ecd416 libarchive: Update script to get 3.4.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4362
 2020-02-14 11:16:12 -05:00
Hugh Sorby
e46e3442fd Makefiles: Re-run CMake if file configured in subdirectory is missing 
Add files configured by all subdirectories to `CMAKE_MAKEFILE_PRODUCTS`
rather than just those from the top level.

Fixes: #19719
 2020-02-14 08:50:15 -05:00
Brad King
5ec88546dd Merge topic 'cpack-doc-ifw' 
fdf50941d2 Help: CPack IFW Generator: not only configures, but also runs QtIFW.
6bb248c133 Help: More cross references between CPackIFW and CPackIFWGenerator.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4356
 2020-02-14 08:40:36 -05:00
Brad King
add917754f Merge topic 'doc-install-dest' 
79e1d86d2c Help: command install: absolute paths unsupported by CPack

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4355
 2020-02-14 08:39:49 -05: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
Joachim Wuttke (o)
40da958d23 Help: CPack Archive Generator: Clarify source vs binary package 
- Simplify summary
- Revise introduction:
  - Explain how to package source files, provide configuration sample
  - Clarify source vs binary package
- Clarify meaning of variables
   (Mandatory=ON makes no sense if a default is defined)
 2020-02-14 21:47:08 +11:00
Kitware Robot
4bfe0b6f0d CMake Nightly Date Stamp 2020-02-14 00:01:07 -05:00
Brad King
b83d96f164 libarchive: Update to build within CMake 
Hard-code more libarchive options as internal cache entries.  Doing so
makes some of our `IF(0)` conditions unnecessary, so remove those.
 2020-02-13 12:59:29 -05:00
Brad King
5d8b3aec0c Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2020-02-11 (3288ebb0)

Also manually restore content from upstream libarchive's main
`CMakeLists.txt` file that was removed by previous commits and
exclude it with `IF(0)` blocks.  Do this as an evil merge so
that `git blame -C` can follow the content to upstream.
 2020-02-13 12:57:52 -05:00
LibArchive Upstream
8cce62295a LibArchive 2020-02-11 (3288ebb0) 
Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit 3288ebb0353beb51dfb09d444dedbe9235ead53d (v3.4.2).
 2020-02-13 12:57:28 -05:00
Brad King
9a27ecd416 libarchive: Update script to get 3.4.2 2020-02-13 12:57:20 -05:00
Joachim Wuttke (o)
fdf50941d2 Help: CPack IFW Generator: not only configures, but also runs QtIFW. 2020-02-13 08:46:04 +01:00
Joachim Wuttke (o)
6bb248c133 Help: More cross references between CPackIFW and CPackIFWGenerator. 
And more concise section "QtIFW Tools".
 2020-02-13 08:14:07 +01:00
Kitware Robot
1acea5cb26 CMake Nightly Date Stamp 2020-02-13 00:01:12 -05:00
Brad King
4d19e9b769 Merge branch 'release-3.17' 2020-02-12 15:04:41 -05: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
b88a671f75 Merge topic 'doc-ascii' into release-3.17 
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
Joachim Wuttke (o)
79e1d86d2c Help: command install: absolute paths unsupported by CPack 
Advise against absolute DESTINATIONs as they are not supported
by CPack installer generators.
 2020-02-12 19:40:04 +01:00
Brad King
85fdac46bd Merge branch 'release-3.17' 2020-02-12 12:05:41 -05:00
Kyle Edwards
72229159d7 Merge topic 'ninja-strcat-usage' 
6e65b869c3 cmNinjaTargetGenerator: cmStrCat usage
9f6544048f cmGlobalNinjaGenerator: cmStrCat usage
04ac0ea501 cmGlobalNinjaGenerator: factor out /all target name computation
a85bea173a cmGlobalNinjaGenerator: avoid unnecessary string addition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4347
 2020-02-12 11:59:21 -05:00
Brad King
125f0451a9 CMake 3.17.0-rc1 v3.17.0-rc1 2020-02-12 10:32:47 -05:00
Brad King
0bfccaa41a Merge branch 'release-3.17' 2020-02-12 10:32:05 -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
87810c5b0b Merge branch 'release-3.17' 2020-02-12 10:01:41 -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
a8b79440b4 Merge branch 'release-3.17' 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
1c648b29e8 Merge branch 'release-3.17' 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
Brad King
05b115b736 Merge topic 'FindHDF5-verify-wrappers' 
659e46b99b FindHDF5: Improve search when not using HDF5 compiler wrapper
d9e39f3f89 FindHDF5: check that compiler wrapper can compile a minimal program

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4345
 2020-02-12 09:20:21 -05:00