summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-mt-return-value'Brad King2013-12-031-1/+2
|\ | | | | | | | | d384b5a cmake: Fix mt return value when hosted on posix (#14605)
| * cmake: Fix mt return value when hosted on posix (#14605)Flynn Marquardt2013-12-021-1/+2
| | | | | | | | | | | | On posix platforms return values are limited to a range from 0 to 255. Cross compiling/linking with MSVC on linux/wine leads to a misinterpretation of the return value 1090650113 of mt.exe.
* | Merge topic 'xcode-folder-dedup'Brad King2013-12-031-7/+7
|\ \ | | | | | | | | | | | | 2dcb1dc Xcode: Fix duplicate target subfolders (#14133)
| * | Xcode: Fix duplicate target subfolders (#14133)Stephan Tolksdorf2013-12-021-7/+7
| |/ | | | | | | | | | | | | Fix logic introduced by commit eeeeca10 (XCode: Support target folders on XCode, 2011-02-20) to avoid duplicate subfolders. The problem was that no slash was appended to the curr_tgt_folder string on the it != this->TargetGroup.end() path.
* | CMake Nightly Date StampKitware Robot2013-12-031-1/+1
| |
* | Merge topic 'use-generator-target'Brad King2013-12-021-0/+5
|\ \ | | | | | | | | | | | | 02a545c Don't generate subdir convenience rules for IMPORTED targets.
| * | Don't generate subdir convenience rules for IMPORTED targets.Stephen Kelly2013-11-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was missing from commit c34968a9 (Port some of the generator API to cmGeneratorTarget., 2012-10-10). The generator targets stored with the cmMakefile include IMPORTED targets, unlike the accessor for resgular targets. Before this patch, rules would be generated for Qt5::Core for example, which result in broken makefiles.
* | | Merge topic 'INTERFACE_AUTOUIC_OPTIONS'Brad King2013-12-029-13/+288
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98093c4 QtAutoUic: Add INTERFACE_AUTOUIC_OPTIONS target property. 02542b4 QtAutoUic: Handle new -include command line parameter. 1242f4e Genex: Add {UPPER,LOWER}_CASE and MAKE_C_IDENTIFIER. 754b321 QtAutogen: Use config without prefix in map key.
| * | | QtAutoUic: Add INTERFACE_AUTOUIC_OPTIONS target property.Stephen Kelly2013-11-278-11/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transitively consume the property from linked dependents. Implement configuration-specific support by following the pattern set out for compile definitions and includes in cmQtAutoGenerators. Implement support for origin-tracking with CMAKE_DEBUG_TARGET_PROPERTIES. This is motivated by the needs of KDE, which provides a separate translation system based on gettext instead of the Qt linguist translation system. The Qt uic tool provides command line options for configuring the method used to translate text, and to add an include directive to the generated file to provide the method. http://thread.gmane.org/gmane.comp.kde.devel.frameworks/7930/focus=7992 Implement the interface to provide the uic options as a usage-requirement on the KI18n target, as designed for KDE.
| * | | QtAutoUic: Handle new -include command line parameter.Stephen Kelly2013-11-271-0/+1
| | | |
| * | | Genex: Add {UPPER,LOWER}_CASE and MAKE_C_IDENTIFIER.Stephen Kelly2013-11-271-0/+48
| | | |
| * | | QtAutogen: Use config without prefix in map key.Stephen Kelly2013-11-271-2/+2
| | | | | | | | | | | | | | | | | | | | This is used by IDE generators to select config-specific includes and defines.
* | | | Merge topic 'wix-components'Brad King2013-12-024-46/+303
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7b390f7 CPackWiX: add CPack component support
| * | | | CPackWiX: add CPack component supportNils Gladitz2013-11-264-46/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a hierarchy of WiX features from CPack components and component groups. Switch to the FeatureTree UI in case components have been defined. Handles the component REQUIRE and HIDDEN options and the component group EXPANDED option.
* | | | | Merge topic 'export-includes'Brad King2013-12-027-23/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5838aba Export: Report error on relative include with genex. 7a3e45b Export: Prefix relative items with genexes in INSTALL_INTERFACE. f088a32 Export: Process INSTALL_INTERFACE in INCLUDES DESTINATION. 9eedc85 Export: Process relative includes after genex evaluation. 80790f3 Export: Test existing behavior of exporting includes with genexes. 38afc82 target_include_directories: Allow relative path with genex
| * | | | | Export: Report error on relative include with genex.Stephen Kelly2013-11-264-15/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diagnostics which check the sanity of exported include paths previously skipped over any path containing a generator expression. Introduce a policy to issue an error message in such cases. The export files created in the OLD behavior are not usable, because they contain relative paths or paths to the source or build location which are not suitable for use on installation. CMake will report an error on import.
| * | | | | Export: Prefix relative items with genexes in INSTALL_INTERFACE.Stephen Kelly2013-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code such as target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include$<FOO>> ) should be treated as a relative directory, despite the genex, after the INSTALL_INTERFACE is stripped away. Previously, this would generate a relative directory on export, which would be an error on import, so no policy is needed.
| * | | | | Export: Process INSTALL_INTERFACE in INCLUDES DESTINATION.Stephen Kelly2013-11-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code such as install(TARGETS ... INCLUDES DESTINATION $<INSTALL_INTERFACE:include> ) should behave as if the INSTALL_INTERFACE wrapper were not present.
| * | | | | Export: Process relative includes after genex evaluation.Stephen Kelly2013-11-262-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In code such as install(TARGETS ... INCLUDES DESTINATION $<FOO>include ) the generator expressions are evaluated at generate-time. Delay determining whether each entry is a relative path until after the generator expressions are evaluated. Such relative paths are based relative to the CMAKE_INSTALL_PREFIX.
| * | | | | target_include_directories: Allow relative path with genexStephen Kelly2013-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat paths which are relative and which contain a generator expression which is not at the beginning as relative to the source directory. This matches the behavior of paths which are relative but contain no generator expression at all. Previously this would generate a relative path with the IMPORTED target on export(), which would be a reported as a non-existent path on import. If used directly in the buildsystem, it would be reported as a relative path, which is also an error. There is no need for a policy in this case.
* | | | | | Merge topic 'KateProjectGenerator2'Brad King2013-12-024-0/+439
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b54c336 kate: add some documentation 9414217 kate: insert build targets 644e012 kate: add project generator for the Kate project plugin
| * | | | | | kate: insert build targetsAlex Neundorf2013-11-252-8/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used by the build plugin in kate. Code is quite similar to the one for Eclipse. Alex
| * | | | | | kate: add project generator for the Kate project pluginAlex Neundorf2013-11-254-0/+304
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds an extra generator for KDE's kate text editor, or better more specifically, the project plugin. Alex
* | | | | | CMake Nightly Date StampKitware Robot2013-12-021-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-12-011-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-11-301-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-11-291-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-11-281-1/+1
| |_|/ / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2013-11-271-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'ninja-compile-link-pool'Brad King2013-11-266-1/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7605e37 Ninja: job pool support for compiling and linking
| * | | | Ninja: job pool support for compiling and linkingPeter Kümmel2013-11-256-1/+58
| |/ / / | | | | | | | | | | | | | | | | Could be tested by setting the environment variable NINJA_STATUS=[%r]
* | | | Merge topic 'autogen-depends'Brad King2013-11-261-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1320e07 cmQtAutogen: Allow specifying depends for autogen targets.
| * | | | cmQtAutogen: Allow specifying depends for autogen targets.Stephen Kelly2013-11-251-0/+5
| |/ / / | | | | | | | | | | | | | | | | Test this by generating files with a custom target, which moc requires to be present when it is run.
* | | | Merge topic 'use-generator-target'Brad King2013-11-261-2/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | a60cd3d cmGeneratorTarget: Use the output directory to order cmTargets.
| * | | cmGeneratorTarget: Use the output directory to order cmTargets.Stephen Kelly2013-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | The output directory must be unique, but the source directory of an add_subdirectory call may be re-used.
* | | | Merge topic 'watcom-no-prompt'Brad King2013-11-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | abd2b36 Watcom: Suppress WMake interactive prompt on error
| * | | | Watcom: Suppress WMake interactive prompt on errorBrad King2013-11-251-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the "-e" option to build.make invocations of wmake as part of the silencing flags. From "wmake /?": -e erase files after error (no prompt) This prevents test timeouts on error.
* | | | Merge topic 'update-kwsys'Brad King2013-11-2615-171/+982
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ba2c43 bootstrap: Add KWSys Encoding and FStream f668112 Merge branch 'upstream-kwsys' into update-kwsys 704ab3d KWSys 2013-11-21 (1010d0e3)
| * | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-11-2515-171/+982
| |/ / /
* | | | Merge topic 'INTERFACE_LIBRARY-property-whitelist'Brad King2013-11-2615-81/+229
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 5ee9e6b cmTarget: Add whitelist of properties on INTERFACE_LIBRARY. 0bfcb45 INTERFACE_LIBRARY: Avoid codepaths which set unneeded properties.
| * | | | cmTarget: Add whitelist of properties on INTERFACE_LIBRARY.Stephen Kelly2013-11-252-0/+76
| | | | |
| * | | | INTERFACE_LIBRARY: Avoid codepaths which set unneeded properties.Stephen Kelly2013-11-2514-81/+153
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As an INTERFACE_LIBRARY has no direct link dependencies, we can short-circuit in cmGeneratorExpressionEvaluator and in cmGlobalGenerator::CheckLocalGenerators. As they do not generate any output directly, any generate- or install- related code acn also be short-circuited. Many of the local generators already do this. Because only INTERFACE related properties make sense on INTERFACE_LIBRARY targets, avoid setting other properties, for example via defaults.
* | | | Merge topic 'ninja-quoted-cmd-commands'Brad King2013-11-261-7/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b6f1142 Ninja: multiple commands must be quoted
| * | | | Ninja: multiple commands must be quotedPeter Kümmel2013-11-251-7/+23
| | | | | | | | | | | | | | | | | | | | Bug 14370
* | | | | Merge topic 'ninja-msvc-deps-for-intel'Brad King2013-11-261-4/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 76a8888 Ninja: deptype msvc for Intel's compiler on Windows
| * | | | | Ninja: deptype msvc for Intel's compiler on WindowsPeter Kümmel2013-11-251-4/+5
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2013-11-261-1/+1
| |/ / / |/| | |
* | | | Merge topic 'use-generator-target'Brad King2013-11-2521-118/+172
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | c34968a Port some of the generator API to cmGeneratorTarget. abb13ea Order cmGeneratorTargetsType elements deterministically.
| * | | Port some of the generator API to cmGeneratorTarget.Stephen Kelly2013-11-2219-117/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Just enough to reach the BuildMacContentDirectory method and the NeedRelinkBeforeInstall methods. In the future, those methods can be moved to cmGeneratorTarget.
| * | | Order cmGeneratorTargetsType elements deterministically.Stephen Kelly2013-11-222-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a custom ordering functor to deterministically and strictly order the cmTarget* key. Otherwise the order would be dependent on runtime pointer values, which breaks assumptions of some generators. The functor orders first by target name, and then by directory. Multiple global targets may have the same name, such as edit_cache, but their directory differentiates them.