summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QtAutoUic: Add INTERFACE_AUTOUIC_OPTIONS target property.Stephen Kelly2013-11-2723-13/+592
| | | | | | | | | | | | | | | | | | | | 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-274-0/+60
|
* 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.
* CMake Nightly Date StampKitware Robot2013-11-271-1/+1
|
* Merge topic 'ninja-compile-link-pool'Brad King2013-11-2613-1/+128
|\ | | | | | | | | 7605e37 Ninja: job pool support for compiling and linking
| * Ninja: job pool support for compiling and linkingPeter Kümmel2013-11-2513-1/+128
| | | | | | | | | | Could be tested by setting the environment variable NINJA_STATUS=[%r]
* | Merge topic 'minor-cleanups'Brad King2013-11-262-2/+2
|\ \ | | | | | | | | | | | | | | | ebeb31d Help: Fix typo in CMP0040 docs. 97b0abb Help: Fix typo in genex docs.
| * | Help: Fix typo in CMP0040 docs.Stephen Kelly2013-11-261-1/+1
| | | | | | | | | | | | 'report and error' -> 'report an error'
| * | Help: Fix typo in genex docs.Stephen Kelly2013-11-261-1/+1
| | | | | | | | | | | | would be require -> would require
* | | Merge topic 'cross-compiling-toolchain-variables'Brad King2013-11-261-2/+7
|\ \ \ | | | | | | | | | | | | | | | | 89ba7b0 Update the Clang pattern to specify compiler options.
| * | | Update the Clang pattern to specify compiler options.Stephen Kelly2013-11-251-2/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | In Clang 3.4, the preferred (and new) option pattern is --target=. http://thread.gmane.org/gmane.comp.compilers.clang.devel/29975 http://llvm.org/viewvc/llvm-project?view=revision&revision=184408 Clang 3.4 is not yet released, but there is a release candidate, and there is a dashboard test of Clang trunk.
* | | Merge topic 'autogen-depends'Brad King2013-11-267-1/+69
|\ \ \ | | | | | | | | | | | | | | | | 1320e07 cmQtAutogen: Allow specifying depends for autogen targets.
| * | | cmQtAutogen: Allow specifying depends for autogen targets.Stephen Kelly2013-11-257-1/+69
| |/ / | | | | | | | | | | | | 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-2616-171/+1002
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ba2c43 bootstrap: Add KWSys Encoding and FStream f668112 Merge branch 'upstream-kwsys' into update-kwsys 704ab3d KWSys 2013-11-21 (1010d0e3)
| * | | | bootstrap: Add KWSys Encoding and FStreamBrad King2013-11-251-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the KWSYS_STL_HAS_WSTRING platform test and configure the result. Configure the Encoding and FStream header files and build the sources. On Windows, build EncodingC.c with KWSYS_ENCODING_DEFAULT_CODEPAGE=CP_ACP.
| * | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-11-2515-171/+982
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | KWSys 2013-11-21 (1010d0e3)KWSys Robot2013-11-2515-171/+982
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 1010d0e3 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 6eab64c3..1010d0e3 Brad King (2): ace1364c Encoding: Remove unused include 1010d0e3 SystemTools: Avoid unused function warnings Clinton Stimpson (4): 0c2ff1f7 Encoding: Add Encoding module. 8abbad82 FStream: Add FStream module. 0a98de97 KWSys: Port to use wide character Windows APIs throughout. 2b0c683d Encoding: Default to ANSI code page on Windows David Cole (1): f67bb2ba SystemTools: Move typedef mode_t inside the SystemTools class Sean McBride (1): a40b9263 SystemInformation: Work around gcc -Wliteral-suffix warning Change-Id: Ie52df972331cc7377c236d410ead86024e9d15ab
* | | | | Merge topic 'libarchive-left-shift-fix'Brad King2013-11-261-11/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5ee1297 libarchive: Port upstream issue 320 fix
| * | | | | libarchive: Port upstream issue 320 fixBrad King2013-11-251-11/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port upstream commit 533e8fda (Rework the sign-extension to avoid left-shift of an explicit negative number, 2013-06-29) into CMake. Inspired-by: Tim Kientzle <kientzle@freebsd.org>
* | | | | Merge topic 'INTERFACE_LIBRARY-property-whitelist'Brad King2013-11-2619-81/+256
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-256-0/+103
| | | | | |
| * | | | | 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 'UseSWIG-fix14520'Brad King2013-11-261-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20028d6 UseSWIG: Remove duplicate include dirs (#14520)
| * | | | | | UseSWIG: Remove duplicate include dirs (#14520)Julien Schueller2013-11-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Shorten the swig command line.
* | | | | | | Merge topic 'UseSWIG-fix13814'Brad King2013-11-261-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acc59e5 UseSWIG: Handle a dll name different than module name (#13814)
| * | | | | | | UseSWIG: Handle a dll name different than module name (#13814)Julien Schueller2013-11-251-0/+4
| | | | | | | |
* | | | | | | | 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
| |/ / / / / / / /
* | | | | | | | | Merge topic 'FindGTK2-quartz-backend'Brad King2013-11-261-2/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | 0e9bf6a FindGTK2: Add support for Quartz backend on MAC
| * | | | | | | | FindGTK2: Add support for Quartz backend on MACDaniele E. Domenichelli2013-11-241-2/+12
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fix issue #14593
* | | | | | | | CMake Nightly Date StampKitware Robot2013-11-261-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge topic 'doc-generators-cleanup'Brad King2013-11-2515-142/+122
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | beec9db Help: Organize and revise the cmake-generators.7 manual
| * | | | | | Help: Organize and revise the cmake-generators.7 manualBrad King2013-11-2515-142/+122
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move "extra" generators to their own section instead of duplicating them for each corresponding main generator. Divide the list of main generators into command-line and IDE sections and sort the names within each section. Document the environment from which each kind of generator may be used. Add a section to each "extra" generator documenting which main generators may be used with it.
* | | | | | Merge topic 'doc-cmake-language-env-vars'Brad King2013-11-251-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45a03aa Help: Document $ENV{VAR} syntax in cmake-language.7 manual
| * | | | | | Help: Document $ENV{VAR} syntax in cmake-language.7 manualBrad King2013-11-251-0/+3
|/ / / / / /
* | | | | | Merge topic 'EclipseParallelMakeOnlyOnUnixHosts'Brad King2013-11-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83751af Eclipse: add -j only on UNIX hosts
| * | | | | | Eclipse: add -j only on UNIX hostsAlex Neundorf2013-11-231-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version added -jN to the make invokation if UNIX was set, but this was true also when cross compiling. What we are actually interested in is CMAKE_HOST_UNIX, i.e. whether the build host is UNIX. Or we should check more exactly what CMAKE_MAKE_PROGRAM is. Alex
* | | | | | Merge topic 'UseSWIG-fix13772'Brad King2013-11-251-30/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 276e373 UseSWIG: Fix .i relative source file location (#13173,#13772,#14459)
| * | | | | | UseSWIG: Fix .i relative source file location (#13173,#13772,#14459)Julien Schueller2013-11-251-30/+2
| |/ / / / /
* | | | | | Merge topic 'FindSWIG-fix13771'Brad King2013-11-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c127c9 FindSWIG: Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT (#13771)
| * | | | | | FindSWIG: Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT (#13771)Julien Schueller2013-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a simpler way to reference the location of UseSWIG.cmake.
* | | | | | | Merge topic 'FindSWIG-fix13449'Brad King2013-11-251-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19b7a54 FindSWIG: Search for swig.swg only on host (#13449)
| * | | | | | | FindSWIG: Search for swig.swg only on host (#13449)Julien Schueller2013-11-221-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use NO_CMAKE_FIND_ROOT_PATH to ensure swig.swg can be found on the host even when cross-compiling.