summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'wix-toplevel-feature-required'Brad King2015-11-101-0/+1
|\ | | | | | | | | d3625b72 CPackWIX: Don't allow users to deselect the top-level feature (#15838)
| * CPackWIX: Don't allow users to deselect the top-level feature (#15838)Nils Gladitz2015-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | 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
* | Merge topic 'fix-install-rules'Brad King2015-11-101-6/+1
|\ \ | | | | | | | | | | | | 9103d8ac Install: Move SetHaveInstallRule to a more-obvious place
| * | Install: Move SetHaveInstallRule to a more-obvious placeStephen Kelly2015-11-081-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | CMake 3.4.0-rc3v3.4.0-rc3Brad King2015-11-021-1/+1
| | |
| * | Merge branch 'fix-find_program-regression' into releaseBrad King2015-10-301-0/+13
| |\ \
| * \ \ Merge branch 'backport-revert-autorcc-qt-5.1' into releaseBrad King2015-10-291-1/+1
| |\ \ \
| | * | | Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"Brad King2015-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0. The `-list` option is not documented and may be removed in future Qt versions. Fixing this correctly will require detecting the availability of `--list` or `-list` based on the `rcc` version found. For now we choose to support the documented option that will be supported in future Qt versions.
| * | | | Merge branch 'vs-resw-files' into releaseBrad King2015-10-291-0/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'cpack-deb-fakeroot-removal' into releaseBrad King2015-10-231-1/+1
| |\ \ \ \ \
* | | | | | | CMake Nightly Date StampKitware Robot2015-11-101-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'cpack-dmg-multilanguage-sla'Brad King2015-11-093-39/+336
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f88533cc CPackDMG: Add support for multilingual SLAs
| * | | | | | CPackDMG: Add support for multilingual SLAsSimon Levermann2015-11-063-39/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'fix-alias-target-access'Brad King2015-11-091-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ce9742a Alias: Fix access at generate-time (#15832)
| * | | | | | | Alias: Fix access at generate-time (#15832)Stephen Kelly2015-11-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | CMake Nightly Date StampKitware Robot2015-11-091-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2015-11-081-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2015-11-071-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'cpack-deb-config-file-source-field'Brad King2015-11-061-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5b70ed0 CPackDEB: added config file optional Source field f2d98e2d CPackDEB: minor documentation and debug logging fixes
| * | | | | | | CPackDEB: added config file optional Source fieldRaffi Enficiaud2015-11-041-0/+7
| | | | | | | |
* | | | | | | | Merge topic 'ninja-version-refactor'Brad King2015-11-062-19/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3c5ca96 cmGlobalNinjaGenerator: Save 'ninja' version very early ed67f405 cmGlobalNinjaGenerator: Save path to 'ninja' tool very early
| * | | | | | | | cmGlobalNinjaGenerator: Save 'ninja' version very earlyBrad King2015-11-022-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep it in a member variable for convenient reference. Store the value as soon as it is known.
| * | | | | | | | cmGlobalNinjaGenerator: Save path to 'ninja' tool very earlyBrad King2015-11-022-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep it in a member variable for convenient reference. Set the value as soon as it is known.
* | | | | | | | | Merge topic 'fortran-line-directives'Brad King2015-11-068-574/+656
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73f255e2 cmFortranLexer: Populate empty doxygen @param comments ba819f49 cmFortranParser: Parse #line directives
| * | | | | | | | cmFortranLexer: Populate empty doxygen @param commentsBrad King2015-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | cmFortranParser: Parse #line directivesBrad King2015-11-028-576/+658
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | CMake Nightly Date StampKitware Robot2015-11-061-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2015-11-051-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'vs-show-def-files'Brad King2015-11-047-16/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | VS: Add module definition `.def` files to .vcxproj files (#15313)Tim Grothe2015-11-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make them appear in the IDE project tree for reference by developers.
| * | | | | | | | Refactor `.def` file lookupTim Grothe2015-11-047-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a `cmSourceFile const*` from GetModuleDefinitionFile so that callers can get more information than just the path to the file.
| * | | | | | | | cmGeneratorTarget: Fix IMPLEMENT_VISIT_IMPL for template data typesBrad King2015-11-041-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update spacing near the DATATYPE reference to prevent construction of `>>` as a preprocessing token if DATATYPE is a template type.
* | | | | | | | CMake Nightly Date StampKitware Robot2015-11-041-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-11-031-1/+1
|/ / / / / /
* | | | | | Merge topic 'xcode-lastupgradecheck'Brad King2015-11-021-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13610474 Xcode: Set LastUpgradeCheck to current Xcode version (#15817)
| * | | | | | Xcode: Set LastUpgradeCheck to current Xcode version (#15817)Gregor Jasny2015-10-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the project settings upgrade warning.
* | | | | | | Merge topic 'fix-find_program-regression'Brad King2015-11-021-0/+13
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 31e6571c find_program: Fix regression in finding an already-known path
| * | | | | | find_program: Fix regression in finding an already-known pathBrad King2015-10-301-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | CMake Nightly Date StampKitware Robot2015-11-021-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-11-011-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-10-311-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-10-301-1/+1
| | | | | |
* | | | | | Merge topic 'vs-resw-files'Brad King2015-10-291-0/+4
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | 77dde5cb VS: Add support for `.resw` files (#15811)
| * | | | | VS: Add support for `.resw` files (#15811)Andrew Shaitorov2015-10-281-0/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | These are used on the WinRT & WinPhone platforms. Build them using the `PRIResource` tool.
* | | | | Merge topic 'autorcc-qt-5.1-compat'Brad King2015-10-291-1/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e78fcc63 QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
| * | | | | QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)Brad King2015-10-281-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge topic 'revert-autorcc-qt-5.1'Brad King2015-10-291-1/+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)"
| * | | | | Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"Brad King2015-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0. The `-list` option is not documented and may be removed in future Qt versions. Fixing this correctly will require detecting the availability of `--list` or `-list` based on the `rcc` version found. For now we choose to support the documented option that will be supported in future Qt versions.
* | | | | | CMake Nightly Date StampKitware Robot2015-10-291-1/+1
| | | | | |
* | | | | | Merge topic 'minor-cleanups'Brad King2015-10-2822-48/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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