kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
30,708 Commits 1 Branch 14 Tags
Commit Graph

20008 Commits

Author SHA1 Message Date
Kitware Robot
48182afd3d CMake Nightly Date Stamp 2015-11-12 00:01:05 -05:00
Sean McBride
710d8bab7e Fix trivial clang -Wdouble-promotion warnings 2015-11-11 16:27:24 -05:00
Kitware Robot
54153fb98d CMake Nightly Date Stamp 2015-11-11 00:01:06 -05:00
Brad King
3cb726371f Merge topic 'wix-toplevel-feature-required' 
d3625b72 CPackWIX: Don't allow users to deselect the top-level feature (#15838)
 2015-11-10 09:26:13 -05:00
Brad King
556fe92b76 Merge topic 'fix-install-rules' 
9103d8ac Install: Move SetHaveInstallRule to a more-obvious place
 2015-11-10 09:26:00 -05:00
Kitware Robot
21684a2401 CMake Nightly Date Stamp 2015-11-10 00:01:06 -05:00
Nils Gladitz
d3625b7283 CPackWIX: Don't allow users to deselect the top-level feature (#15838) 
The top-level WiX feature implicitly created by the WIX generator
represents the package as a whole.

As such it does not make sense to allow installer users to deselect
it from the installation.

Suggested-by: Mark Stijnman
 2015-11-09 17:50:21 +01:00
Brad King
0ecb5e7f8b Merge topic 'cpack-dmg-multilanguage-sla' 
f88533cc CPackDMG: Add support for multilingual SLAs
 2015-11-09 10:06:38 -05:00
Brad King
ed484544cb Merge topic 'fix-alias-target-access' 
4ce9742a Alias: Fix access at generate-time (#15832)
 2015-11-09 10:06:33 -05:00
Kitware Robot
c53e692db9 CMake Nightly Date Stamp 2015-11-09 00:01:06 -05:00
Stephen Kelly
9103d8ace3 Install: Move SetHaveInstallRule to a more-obvious place 
The moved-from location checks for the existence of whether certain
generators are needed for any target in a loop, rather than whether
the current target has an install rule.

This was introduced in commit v3.4.0-rc1~275^2~3 (cmInstallCommand: Move
the SetHaveInstallRule invocation., 2015-07-28).  Move the
SetHaveInstallRule call to a more-obvious place where the
cmInstallTargetGenerator is constructed.
 2015-11-08 13:56:11 +01:00
Stephen Kelly
4ce9742ae3 Alias: Fix access at generate-time (#15832) 
Commit c389f8bb (cmLocalGenerator: Port Find method away from
GetGeneratorTarget, 2015-10-25) ported the implementation of
FindGeneratorTargetToUse away from the FindTargetToUse method,
but neglected to handle alias targets.

The latter method has a parameter to determine whether to
include alias targets in the search, but as that is only
needed at configure time, this generate-time equivalent does
not need the condition.
 2015-11-08 13:54:49 +01:00
Kitware Robot
f071d8ebd4 CMake Nightly Date Stamp 2015-11-08 00:01:05 -05:00
Kitware Robot
da65c5191c CMake Nightly Date Stamp 2015-11-07 00:01:06 -05:00
Brad King
39e830a98e Merge topic 'cpack-deb-config-file-source-field' 
e5b70ed0 CPackDEB: added config file optional Source field
f2d98e2d CPackDEB: minor documentation and debug logging fixes
 2015-11-06 14:58:11 -05:00
Brad King
5bd78b0e99 Merge topic 'ninja-version-refactor' 
a3c5ca96 cmGlobalNinjaGenerator: Save 'ninja' version very early
ed67f405 cmGlobalNinjaGenerator: Save path to 'ninja' tool very early
 2015-11-06 14:58:09 -05:00
Brad King
08b8fef254 Merge topic 'fortran-line-directives' 
73f255e2 cmFortranLexer: Populate empty doxygen @param comments
ba819f49 cmFortranParser: Parse #line directives
 2015-11-06 14:58:06 -05:00
Simon Levermann
f88533cc06 CPackDMG: Add support for multilingual SLAs 
Multiple languages for SLAs and the SLA UI can be added via the CPack
variables CPACK_DMG_SLA_DIR and CPACK_DMG_SLA_LANGUAGES.  For each
language defined in the languages variable, CPack will search for
<language>.menu.txt and <language>.license.txt in CPACK_DMG_SLA_DIR.
If the sla directory variable is not defined, the old behaviour using
CPACK_RESOURCE_FILE_LICENSE is retained.
 2015-11-06 11:14:49 -05:00
Kitware Robot
13dc7bdb5e CMake Nightly Date Stamp 2015-11-06 00:01:05 -05:00
Kitware Robot
60cbd9b9da CMake Nightly Date Stamp 2015-11-05 00:01:10 -05:00
Raffi Enficiaud
e5b70ed013 CPackDEB: added config file optional Source field 2015-11-04 21:46:22 +01:00
Brad King
49ac682d39 Merge topic 'vs-show-def-files' 
e7e713cc VS: Add module definition `.def` files to .vcxproj files (#15313)
247c168b Refactor `.def` file lookup
adfc8a67 cmGeneratorTarget: Fix IMPLEMENT_VISIT_IMPL for template data types
 2015-11-04 10:13:27 -05:00
Tim Grothe
e7e713cc05 VS: Add module definition .def files to .vcxproj files (#15313) 
Make them appear in the IDE project tree for reference by developers.
 2015-11-04 09:15:14 -05:00
Tim Grothe
247c168b98 Refactor .def file lookup 
Return a `cmSourceFile const*` from GetModuleDefinitionFile so that
callers can get more information than just the path to the file.
 2015-11-04 09:15:14 -05:00
Brad King
adfc8a677e cmGeneratorTarget: Fix IMPLEMENT_VISIT_IMPL for template data types 
Update spacing near the DATATYPE reference to prevent construction
of `>>` as a preprocessing token if DATATYPE is a template type.
 2015-11-04 09:15:13 -05:00
Brad King
73f255e29d cmFortranLexer: Populate empty doxygen @param comments 
Re-apply the change from commit v3.0.0-rc1~554^2~2 (cm*Lexer: Populate
empty doxygen @param comment, 2013-09-19) after recent lexer generation.
 2015-11-04 09:13:18 -05:00
Kitware Robot
fe00c137a8 CMake Nightly Date Stamp 2015-11-04 00:01:05 -05:00
Kitware Robot
b87bed0ff6 CMake Nightly Date Stamp 2015-11-03 00:01:08 -05:00
Brad King
a3c5ca960b cmGlobalNinjaGenerator: Save 'ninja' version very early 
Keep it in a member variable for convenient reference.  Store the
value as soon as it is known.
 2015-11-02 16:37:59 -05:00
Brad King
ed67f40522 cmGlobalNinjaGenerator: Save path to 'ninja' tool very early 
Keep it in a member variable for convenient reference.  Set the
value as soon as it is known.
 2015-11-02 16:27:31 -05:00
Brad King
ba819f49df cmFortranParser: Parse #line directives 
Teach the lexer to extract the #line directive prefix and line number as
a new token type.  Teach the parser to recognize this token followed by
a string as the file name (plus possibly other content).  Report the
named file as included by the source file.
 2015-11-02 15:29:52 -05:00
Brad King
bc4b6aa68d CMake 3.4.0-rc3 2015-11-02 09:12:44 -05:00
Brad King
06ed3eb9e9 Merge topic 'xcode-lastupgradecheck' 
13610474 Xcode: Set LastUpgradeCheck to current Xcode version (#15817)
 2015-11-02 09:09:49 -05:00
Brad King
b7b3b675fd Merge topic 'fix-find_program-regression' 
31e6571c find_program: Fix regression in finding an already-known path
 2015-11-02 09:09:46 -05:00
Kitware Robot
96ac964d76 CMake Nightly Date Stamp 2015-11-02 00:01:11 -05:00
Kitware Robot
3db46ec57d CMake Nightly Date Stamp 2015-11-01 00:01:05 -04:00
Kitware Robot
b7fdc8cc39 CMake Nightly Date Stamp 2015-10-31 00:01:07 -04:00
Gregor Jasny
1361047406 Xcode: Set LastUpgradeCheck to current Xcode version (#15817) 
This prevents the project settings upgrade warning.
 2015-10-30 22:28:04 +01:00
Brad King
1178b53662 Merge branch 'fix-find_program-regression' into release 2015-10-30 08:38:13 -04:00
Brad King
31e6571cca find_program: Fix regression in finding an already-known path 
Changes in commit v3.4.0-rc1~124^2~1 (cmFindProgramCommand: Re-implement
search using more flexible approach, 2015-09-01) did not preserve the
behavior of looking for the given name with no search path at all.
Fix this and add a test case covering finding an absolute path with
no search directories.
 2015-10-30 07:40:46 -04:00
Kitware Robot
a375702eaa CMake Nightly Date Stamp 2015-10-30 00:01:07 -04:00
Brad King
81dbab6e08 Merge branch 'backport-revert-autorcc-qt-5.1' into release 2015-10-29 09:03:44 -04:00
Brad King
e41c1be543 Merge branch 'vs-resw-files' into release 2015-10-29 09:03:30 -04:00
Brad King
41e5605d02 Merge topic 'vs-resw-files' 
77dde5cb VS: Add support for `.resw` files (#15811)
 2015-10-29 08:42:32 -04:00
Brad King
b5d94065c0 Merge topic 'autorcc-qt-5.1-compat' 
e78fcc63 QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
 2015-10-29 08:42:22 -04:00
Brad King
e14709e5a5 Merge topic 'revert-autorcc-qt-5.1' 
5ba32092 Merge branch 'backport-revert-autorcc-qt-5.1' into revert-autorcc-qt-5.1
10e8ccf6 Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
b935db3a Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
 2015-10-29 08:42:19 -04:00
Kitware Robot
fbb8d086ba CMake Nightly Date Stamp 2015-10-29 00:01:07 -04:00
Andrew Shaitorov
77dde5cb1f VS: Add support for .resw files (#15811) 
These are used on the WinRT & WinPhone platforms.  Build them using the
`PRIResource` tool.
 2015-10-28 15:19:21 -04:00
Brad King
e78fcc6329 QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644) 
In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their
input changes, 2014-09-17) we added use of the rcc `--list` option.
Prior to Qt 5.2 this option was called just `-list`.  Run `rcc --help`
to check for support for `--list` before using it and otherwise fall
back to the `-list` option for compatibility with older versions.
 2015-10-28 09:03:10 -04:00
Brad King
2fd5fd1f4d Merge topic 'minor-cleanups' 
13a37f5f cmMakefile: Fix typo in comment
958508bb cmMakefile: Fix style
91a829c1 Makefiles: Remove unused variable
e0213882 cmTarget: Remove obsolete member
0554c2c9 cmTarget: Fix style
b22e5d0a Remove some obsolete declarations
ce43ed2c Use LocalGenerator when possible
d90c9738 Makefiles: Remove some unneeded casts
331023ae Export: Remove unused variable
a03f3d0e cmFunctionBlocker: Constify method
d50c4220 Xcode: Fix typo in comment
803f1901 Xcode: Remove trailing semicolon
 2015-10-28 08:48:08 -04:00