Commit Graph

41435 Commits

Author SHA1 Message Date
Tobias C. Berner f835f189ae GNUInstallDirs: Update FreeBSD "info" destination to share/info
FreeBSD ports commit r484628 (Install texinfo files (GNU info) into
${PREFIX}/share/info, 2018-11-10) changed the "info" destination
from "info" to "share/info".  The commit included a patch to their
distribution of CMake to fix the `GNUInstallDirs` module too.
Apply a similar logic change to our upstream version of the module.

We already made a similar change for GNU/kFreeBSD in commit
v3.13.0-rc2~8^2 (GNUInstallDirs: Don't use BSD info and man paths on
GNU/kFreeBSD, 2018-10-21).

Fixes: #18585
2018-11-13 13:35:50 -05:00
Brad King 4c0d97dd98 GNUInstallDirs: Split "info" and "man" default logic
The conditions may soon differ.
2018-11-13 13:35:35 -05:00
Brad King 1b8f0ca515 Tests: Split GNUInstallDirs expectations for FreeBSD 2018-11-13 13:35:19 -05:00
Brad King 9fee704227 Merge topic 'SelectLibraryConfigurations'
fe15a1029c Help: Revise documentation of SelectLibraryConfigurations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2608
2018-11-13 10:46:54 -05:00
Brad King fb93f7f230 Merge topic 'env2'
26a70449cc Help: Describe environment variables as such.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2609
2018-11-13 10:46:07 -05:00
Brad King 06ef9edd51 Merge topic 'DeployQt4'
3a7f02197b Help: Downcase function names in DeployQt4 doc.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2600
2018-11-13 10:41:20 -05:00
Brad King bd04db899f Merge topic 'WriteCompilerDetectionHeader'
0470ee96b1 Help: Remove duplication of function name.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2605
2018-11-13 10:40:38 -05:00
Brad King 4fd97bbc2c Merge branch 'release-3.13' 2018-11-13 10:39:12 -05:00
Brad King 9bb203ed0f Merge topic 'FindBoost-1.69'
5045cd82d0 FindBoost: Additional fixes for 1.69

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2601
2018-11-13 10:38:54 -05:00
Brad King ad6ef6c1d5 Merge branch 'FindBoost-1.69' into release-3.13
Merge-request: !2601
2018-11-13 10:37:23 -05:00
Roger Leigh 5045cd82d0 FindBoost: Additional fixes for 1.69 2018-11-13 10:37:01 -05:00
Brad King 247266aa3f Merge topic 'vs-just-my-code-flag-map'
516c6fc38c VS: Add flag table entry for -JMC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2587
2018-11-13 10:33:05 -05:00
Brad King d3b932fa67 Merge topic 'colored-ctest-summary'
ffdec37a19 CTest: Add colored output on tests summary where supported

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2577
2018-11-13 10:32:05 -05:00
Brad King 71e77972c1 Merge topic 'if_support_checking_if_cache_var_defined'
1222f02e34 If: Support the 'DEFINED CACHE{}' syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2561
2018-11-13 10:29:36 -05:00
Ben Boeckel a7d2ffb232 FindX11: add imported targets
These imported targets are fine-grained and recommended over the global
`X11_LIBRARIES` and `X11_INCLUDE_DIR` variables.
2018-11-13 10:22:00 -05:00
Joachim Wuttke (l) df780bcc01 Help: Move deprecated modules to appropriate section.
Move deprecated or obsolete modules to the section
"Deprectated Modules" of cmake-modules(7):

- MacroAddFileDependencies (Text says: Using the macro
  MACRO_ADD_FILE_DEPENDENCIES() is discouraged.)
- UsePkgConfig (Text calls it "obsolete")
- Use_wxWindows (was already listed in deprecation section)
2018-11-13 13:06:30 +01:00
Joachim Wuttke (l) dcf11cbcdc Help: Mention endmacro argument as legacy only.
Same change as previously done for function, if, while, ...
2018-11-13 12:14:55 +01:00
Joachim Wuttke (l) fe15a1029c Help: Revise documentation of SelectLibraryConfigurations
List format for chosen variables.

New paragraph before description of special cases.
2018-11-13 12:12:52 +01:00
Joachim Wuttke (l) 26a70449cc Help: Describe environment variables as such.
In each environment variable doc page, insert an opening
paragraph (ENV_VAR.txt) to say that this is an environment
variable, and provide a link to the cmake-language section
on environment variables.
2018-11-13 09:29:36 +01:00
Kitware Robot 5e12fad870 CMake Nightly Date Stamp 2018-11-13 00:01:07 -05:00
Brad King 518b0cf3b6 Merge topic 'BundleUtilities'
96c31fad71 Help: Downcase functions in BundleUtilities

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2599
2018-11-12 16:36:01 -05:00
Brad King 68c86a20ce Merge topic 'FindPackageMessage'
89b5f4fcc7 Help: Correct macro -> function in FindPackageMessage.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2598
2018-11-12 16:34:24 -05:00
Joachim Wuttke (l) 0470ee96b1 Help: Remove duplication of function name. 2018-11-12 22:33:11 +01:00
Brad King a39d6f6bc3 Merge topic 'CheckPrototypeDefinition'
f05d7ed5ff Help: correct macro -> function in CheckPrototypeDefinition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2591
2018-11-12 16:33:10 -05:00
Brad King f370254652 Merge topic 'DocumentationVTK'
36e9d2d124 Help: remove reference to inexistent file DocumentationVTK.cmake.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2597
2018-11-12 16:31:53 -05:00
Brad King 4884954413 Merge topic 'CMakeAddFortranSubdirectory'
b93b3b5500 Help: better summary and xrefs for CMakeAddFortranSubdirectory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2592
2018-11-12 16:31:03 -05:00
Brad King 45fb82483c Merge topic 'CMakePrintHelpers'
1c94129e98 Help: correct macro -> function in CMakePrintHelpers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2596
2018-11-12 16:29:56 -05:00
Brad King db984477e4 Merge topic 'deprecate-ParseArguments'
ff800a768c Help: move CMakeParseArguments to deprecated section

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2595
2018-11-12 16:28:30 -05:00
Brad King 72d54f1c53 Merge topic 'CPack-sections'
e286627334 Help: Insert section headers in CPack module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2593
2018-11-12 16:26:11 -05:00
Ben Boeckel 40b3dba529 FindX11: require Freetype and Fontconfig for Xft
The Xft header includes headers from freetype and fontconfig, so they
are necessary for its use.
2018-11-12 16:10:14 -05:00
Ben Boeckel cc96249e2e FindX11: remove local variable from the advanced list 2018-11-12 16:10:14 -05:00
Ben Boeckel 99489d9f10 FindX11: find Xext.h 2018-11-12 16:10:13 -05:00
Ben Boeckel b8b598061a FindX11: match variables with library names
This deprecates various variables, but provides them for backwards
compatibility.
2018-11-12 16:09:36 -05:00
Craig Scott ddb967cca1 Merge topic 'pie-link-options'
c4b4d8b3a6 POSITION_INDEPENDENT_CODE: Manage link flags for executables
724a0346f7 POSITION_INDEPENDENT_CODE: Fix erroneous '-fPIE' flag for Sun Studio
023188ffb4 INTERFACE_POSITION_INDEPENDENT_CODE: add generator expressions support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2465
2018-11-12 15:43:07 -05:00
Ben Boeckel 6079a0d00f FindX11: fix some formatting in the documentation 2018-11-12 14:42:56 -05:00
Joachim Wuttke (o) 3a7f02197b Help: Downcase function names in DeployQt4 doc. 2018-11-12 19:51:43 +01:00
Ben Boeckel 3c54955d0d FindX11: use list(APPEND) for clearer code 2018-11-12 13:30:07 -05:00
Ben Boeckel 1217ff4138 FindX11: use lowercase function names 2018-11-12 11:50:52 -05:00
Joachim Wuttke (o) 96c31fad71 Help: Downcase functions in BundleUtilities
Presumably, capitalization was left over from very old times
2018-11-12 15:49:31 +01:00
Joachim Wuttke (o) f05d7ed5ff Help: correct macro -> function in CheckPrototypeDefinition
Correct in text, and downcase function name in function statement.
2018-11-12 15:41:09 +01:00
Joachim Wuttke (l) 89b5f4fcc7 Help: Correct macro -> function in FindPackageMessage.
Correct in the text, and change capitalization accordingly.
2018-11-12 15:34:41 +01:00
Joachim Wuttke (h) e286627334 Help: Insert section headers in CPack module
The one extant section header was confusing at least:
Not all the doc page is on Variables.
2018-11-12 09:18:02 -05:00
Joachim Wuttke (l) 36e9d2d124 Help: remove reference to inexistent file DocumentationVTK.cmake. 2018-11-12 14:27:41 +01:00
Brad King c310480c5d Merge topic 'autogen_global_target'
0e97ef74d8 Autogen: Add release notes for CMAKE_GLOBAL_AUTOGEN/RCC_TARGET
2ef8fe2222 Autogen: Add documentation for CMAKE_GLOBAL_AUTOGEN/RCC_TARGET
8c8731b422 Autogen: Add test for CMAKE_GLOBAL_AUTOGEN/RCC_TARGET
3baa817c34 Autogen: Add support for global ``autogen`` and ``autorcc`` targets
3327d3bb20 Autogen: Add cmQtAutoGenGlobalInitializer class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2567
2018-11-12 08:22:39 -05:00
Brad King a16b24c9ce Merge topic 'FindODBC-mingw-avoid-hardcoded-odbc32'
4e4551f9f3 FindODBC: Do not assume odbc32.lib for MinGW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2585
2018-11-12 08:19:32 -05:00
Brad King a63a9363b2 Merge topic 'FindICU-link-dl'
1320122d3f FindICU: Add libdl to the link libraries for icu-uc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Francois Budin <francois.budin@kitware.com>
Merge-request: !2581
2018-11-12 08:18:47 -05:00
Brad King f52dc4cae1 Merge branch 'release-3.13' 2018-11-12 08:17:41 -05:00
Brad King baf8af10a7 Merge topic 'asm-compiler-id-clang'
c84fb4812d ASM: Detect compiler id for Clang used as Assembler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2584
2018-11-12 08:16:28 -05:00
Brad King 7704693e9a Merge topic 'FindBoost-compiler-guess-update'
b71667a395 FindBoost: Improve compiler prefix detection for GCC 5+ and clang 4+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2579
2018-11-12 08:14:48 -05:00
Kitware Robot 776fd9b947 CMake Nightly Date Stamp 2018-11-12 00:01:07 -05:00