summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindSWIG-3498'Brad King2013-12-021-2/+0
|\ | | | | | | | | 5d3b0bb FindSWIG: allow to provide SWIG_DIR (#3498)
| * FindSWIG: allow to provide SWIG_DIR (#3498)Julien Schueller2013-12-011-2/+0
| |
* | Merge topic 'UseSWIG-octave'Brad King2013-12-021-1/+4
|\ \ | | | | | | | | | | | | f39671c UseSWIG: Handle octave extensions.
| * | UseSWIG: Handle octave extensions.Julien Schueller2013-11-291-1/+4
| |/
* | Merge topic 'UseSWIG-fix12184'Brad King2013-12-021-2/+12
|\ \ | | | | | | | | | | | | 74f5545 UseSWIG: set .bundle ext on OSX and no prefix (#12184)
| * | UseSWIG: set .bundle ext on OSX and no prefix (#12184)Julien Schueller2013-11-281-2/+12
| | |
* | | Merge topic 'UseSWIG-fix13318'Brad King2013-12-021-4/+7
|\ \ \ | | | | | | | | | | | | | | | | a87c063 UseSWIG: Name python module according to swig flags (#13318)
| * | | UseSWIG: Name python module according to swig flags (#13318)Julien Schueller2013-11-261-4/+7
| | | |
* | | | Merge topic 'export-includes'Brad King2013-12-0241-26/+427
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2628-15/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-263-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-263-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-265-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Export: Test existing behavior of exporting includes with genexes.Stephen Kelly2013-11-265-1/+54
| | | | | | | | | | | | | | | | | | | | Test that no warning or error diagnostic is issued for 'good code'.
| * | | | target_include_directories: Allow relative path with genexStephen Kelly2013-11-264-2/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-027-0/+497
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b54c336 kate: add some documentation 9414217 kate: insert build targets 644e012 kate: add project generator for the Kate project plugin
| * | | | kate: add some documentationAlex Neundorf2013-11-252-0/+27
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | 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-255-0/+335
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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-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)