mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-09 23:44:00 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 06cc050c1f Help/dev: Drop 'size_t' preference from source code guide 
We now use `std::size_t` in several places and it is fully supported by
C++11 compilers.  Drop the recommendation to prefer plain `size_t`.
 2018-11-14 14:28:57 -05:00
Sebastian Holtermann e0c26406aa Autogen: Sort tests 2018-11-14 19:21:03 +01:00
Sebastian Holtermann 83bbfb1d53 Autogen: Add a definitions test to the MocOnly test 2018-11-14 19:21:03 +01:00
Sebastian Holtermann 01d5e5c460 Autogen: Add and use cmQtAutoGenInitializer::InfoWriter class 
The new ``cmQtAutoGenInitializer::InfoWriter`` class provides an
interface to write strings/vectors/sets/maps in CMake format
into a file.  Its use replaces various `cmJoin` calls that
failed to address escaping of semicolons in list elements.

Closes #18554
 2018-11-14 19:21:03 +01:00
Joachim Wuttke (o) 254a849864 Help: Spell out MFC 
And shorten text that was hard to understand and redundant.
 2018-11-14 17:50:45 +01:00
Joachim Wuttke (o) b173c641c4 Help: Add links to variables 2018-11-14 17:50:45 +01:00
Brad King ca355d92d8 Tests: Add option for custom RunCMake.XcodeProject timeout 
The test has many cases and can take a long time on busy machines.
 2018-11-14 11:50:36 -05:00
Brad King f3a381115f Tests: Simplify RunCMake.WriteBasicConfigVersionFile 2018-11-14 10:46:39 -05:00
Brad King 0dbcc1afbf Tests: Factor out RunCMake.WriteBasicConfigVersionFile test 
The `WriteBasicConfigVersionFile` section of the `FindPackageTest`
is independent of the rest.
 2018-11-14 10:46:08 -05:00
Brad King 117272412e Merge topic 'GNUInstallDirs-FreeBSD-info' 
f835f189ae GNUInstallDirs: Update FreeBSD "info" destination to share/info
4c0d97dd98 GNUInstallDirs: Split "info" and "man" default logic
1b8f0ca515 Tests: Split GNUInstallDirs expectations for FreeBSD

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !2588
 2018-11-14 08:59:19 -05:00
Kitware Robot aa4ab1f904 CMake Nightly Date Stamp 2018-11-14 00:01:04 -05:00
Frank Benkstein 6199637e95 configure_file: canonicalize input and output path in dependencies 
Represent the input file path internally in canonical form.  Otherwise
multiple `configure_file` calls that share the same input file but specify
it relative to different directories (e.g. via `../`) result in multiple
copies of the dependency on the rule to re-run CMake.  This causes the
Ninja generator to emit duplicate phony build statements for these
dependencies, which generates an error with `-w dupbuild=err`, which
will be default in Ninja 1.9.

Also canonicalize the output path for consistency.

Add a test case.

Fixes: #18584
 2018-11-13 15:01:17 -05:00
Brad King 64bc4bda74 Merge topic 'deprecate-modules2' 
df780bcc01 Help: Move deprecated modules to appropriate section.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2603
 2018-11-13 14:25:58 -05:00
Brad King dc551c2b0d Merge topic 'macro+function-invocation' 
abb5945bd0 Help: Document that function invocation is case-insensitive
357cdee3a1 Help: Document that macro invocation is case-insensitive

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2607
 2018-11-13 14:25:10 -05:00
Joachim Wuttke (l) abb5945bd0 Help: Document that function invocation is case-insensitive 2018-11-13 13:47:26 -05:00
Joachim Wuttke (l) 357cdee3a1 Help: Document that macro invocation is case-insensitive 2018-11-13 13:47:24 -05:00
Brad King 3603b3964b Merge topic 'macro' 
dcf11cbcdc Help: Mention endmacro argument as legacy only.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2606
 2018-11-13 13:40:55 -05:00
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