Commit Graph

46854 Commits

Author SHA1 Message Date
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
Kitware Robot 4bfe0b6f0d CMake Nightly Date Stamp 2020-02-14 00:01:07 -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
Brad King 6a0993a5bf Merge branch 'release-3.17' 2020-02-12 09:15:55 -05:00
Brad King 645474dba1 Merge topic 'ninja-multi-default-configs-fix' into release-3.17
46c836644d Ninja Multi-Config: Fix issue with "all" in CMAKE_NMC_DEFAULT_CONFIGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4349
2020-02-12 09:15:54 -05:00
Brad King 566a9c8467 Merge topic 'ninja-multi-default-configs-fix'
46c836644d Ninja Multi-Config: Fix issue with "all" in CMAKE_NMC_DEFAULT_CONFIGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4349
2020-02-12 09:15:54 -05:00
Brad King 10b834a3eb Merge topic 'file-CONFIGURE_DEPENDS-verify-CMP0009' into release-3.17
818ec34bdd file: GLOB_RECURSE VerifyGlobs.cmake should have CMP0009 set to new
b620dc566d file: Fix GLOB_RECURSE LIST_DIRECTORIES documentation regarding CMP0009
715f90bdd9 Tests: Perform minor cleanups in RunCMake.file test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4342
2020-02-12 09:15:07 -05:00
Brad King 1c19cd19a4 Merge branch 'release-3.17' 2020-02-12 09:15:07 -05:00
Brad King 578ae24eb7 Merge topic 'file-CONFIGURE_DEPENDS-verify-CMP0009'
818ec34bdd file: GLOB_RECURSE VerifyGlobs.cmake should have CMP0009 set to new
b620dc566d file: Fix GLOB_RECURSE LIST_DIRECTORIES documentation regarding CMP0009
715f90bdd9 Tests: Perform minor cleanups in RunCMake.file test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4342
2020-02-12 09:15:07 -05:00
Brad King 3777e70adb Merge branch 'release-3.16' 2020-02-12 09:11:22 -05:00
Brad King 9097d58afc Merge branch 'release-3.15' 2020-02-12 09:11:19 -05:00
Brad King 3a0f182042 Merge branch 'release-3.14' 2020-02-12 09:11:16 -05:00
Brad King b492400e18 Merge branch 'release-3.17' 2020-02-12 09:05:32 -05:00
Brad King 96ee8b7266 Merge topic 'install-default-fix' into release-3.17
9442ae5083 install: Fix regression when using default destinations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4340
2020-02-12 09:05:31 -05:00
Brad King 093b57bced Merge topic 'install-default-fix'
dd8d5004a9 Merge branch 'backport-3.16-install-default-fix'
45d5abf4a8 Merge branch 'backport-3.15-install-default-fix'
0a4d829c36 Merge branch 'backport-3.14-install-default-fix'
b519db6217 install: Fix regression when using default destinations
b4b60d1c3a install: Fix regression when using default destinations
9442ae5083 install: Fix regression when using default destinations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4340
2020-02-12 09:05:31 -05:00
Brad King 0f0d8f5b6f Merge branch 'backport-3.16-install-default-fix' into release-3.16 2020-02-12 09:01:23 -05:00
Brad King 8871cb57e2 Merge branch 'backport-3.15-install-default-fix' into release-3.15
Merge-request: !4340
2020-02-12 09:00:27 -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
Kitware Robot c425920cb1 CMake Nightly Date Stamp 2020-02-12 00:01:12 -05:00