kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,634 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

22634 Commits

Author SHA1 Message Date
Stephen Kelly 02542b4cc7 QtAutoUic: Handle new -include command line parameter. 2013-11-27 19:06:12 +01:00
Stephen Kelly 1242f4e569 Genex: Add {UPPER,LOWER}_CASE and MAKE_C_IDENTIFIER. 2013-11-27 19:06:12 +01:00
Stephen Kelly 754b321272 QtAutogen: Use config without prefix in map key. 
This is used by IDE generators to select config-specific includes
and defines.
 2013-11-27 19:06:12 +01:00
Kitware Robot d05e0aa845 CMake Nightly Date Stamp 2013-11-27 00:01:12 -05:00
Brad King b80ef72b4d Merge topic 'ninja-compile-link-pool' 
7605e37 Ninja: job pool support for compiling and linking
 2013-11-26 09:52:35 -05:00
Brad King fd2ffb42aa Merge topic 'minor-cleanups' 
ebeb31d Help: Fix typo in CMP0040 docs.
97b0abb Help: Fix typo in genex docs.
 2013-11-26 09:48:21 -05:00
Brad King 8b585eed44 Merge topic 'cross-compiling-toolchain-variables' 
89ba7b0 Update the Clang pattern to specify compiler options.
 2013-11-26 09:38:55 -05:00
Brad King 3eca31f81a Merge topic 'autogen-depends' 
1320e07 cmQtAutogen: Allow specifying depends for autogen targets.
 2013-11-26 09:38:40 -05:00
Brad King 235c2d26dc Merge topic 'use-generator-target' 
a60cd3d cmGeneratorTarget: Use the output directory to order cmTargets.
 2013-11-26 09:38:18 -05:00
Brad King 9498344c9d Merge topic 'watcom-no-prompt' 
abd2b36 Watcom: Suppress WMake interactive prompt on error
 2013-11-26 09:37:52 -05:00
Brad King 3ad5f9a075 Merge topic 'update-kwsys' 
2ba2c43 bootstrap: Add KWSys Encoding and FStream
f668112 Merge branch 'upstream-kwsys' into update-kwsys
704ab3d KWSys 2013-11-21 (1010d0e3)
 2013-11-26 09:37:24 -05:00
Brad King 6faf87eb98 Merge topic 'libarchive-left-shift-fix' 
5ee1297 libarchive: Port upstream issue 320 fix
 2013-11-26 09:37:15 -05:00
Brad King 779fd10160 Merge topic 'INTERFACE_LIBRARY-property-whitelist' 
5ee9e6b cmTarget: Add whitelist of properties on INTERFACE_LIBRARY.
0bfcb45 INTERFACE_LIBRARY: Avoid codepaths which set unneeded properties.
 2013-11-26 09:36:58 -05:00
Brad King 784e6e7f15 Merge topic 'UseSWIG-fix14520' 
20028d6 UseSWIG: Remove duplicate include dirs (#14520)
 2013-11-26 09:36:46 -05:00
Brad King 0ccc535734 Merge topic 'UseSWIG-fix13814' 
acc59e5 UseSWIG: Handle a dll name different than module name (#13814)
 2013-11-26 09:36:22 -05:00
Brad King 48e476c3f4 Merge topic 'ninja-quoted-cmd-commands' 
b6f1142 Ninja: multiple commands must be quoted
 2013-11-26 09:36:04 -05:00
Brad King e1fd64837d Merge topic 'ninja-msvc-deps-for-intel' 
76a8888 Ninja: deptype msvc for Intel's compiler on Windows
 2013-11-26 09:35:41 -05:00
Brad King 170c50da38 Merge topic 'FindGTK2-quartz-backend' 
0e9bf6a FindGTK2: Add support for Quartz backend on MAC
 2013-11-26 09:35:13 -05:00
Stephen Kelly ebeb31db2f Help: Fix typo in CMP0040 docs. 
'report and error' -> 'report an error'
 2013-11-26 12:10:37 +01:00
Stephen Kelly 97b0abb423 Help: Fix typo in genex docs. 
would be require -> would require
 2013-11-26 12:10:25 +01:00
Kitware Robot b4727858c4 CMake Nightly Date Stamp 2013-11-26 00:01:08 -05:00
Stephen Kelly 89ba7b0046 Update the Clang pattern to specify compiler options. 
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.
 2013-11-25 23:01:21 +01:00
Stephen Kelly 1320e0768e cmQtAutogen: Allow specifying depends for autogen targets. 
Test this by generating files with a custom target, which moc
requires to be present when it is run.
 2013-11-25 22:41:21 +01:00
Peter Kümmel 7605e37aab Ninja: job pool support for compiling and linking 
Could be tested by setting the environment
variable NINJA_STATUS=[%r]
 2013-11-25 22:23:24 +01:00
Stephen Kelly a60cd3d3c6 cmGeneratorTarget: Use the output directory to order cmTargets. 
The output directory must be unique, but the source directory
of an add_subdirectory call may be re-used.
 2013-11-25 21:13:10 +01:00
Brad King abd2b36089 Watcom: Suppress WMake interactive prompt on error 
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.
 2013-11-25 13:14:38 -05:00
Brad King 2ba2c435f6 bootstrap: Add KWSys Encoding and FStream 
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.
 2013-11-25 12:46:09 -05:00
Brad King f668112039 Merge branch 'upstream-kwsys' into update-kwsys 2013-11-25 11:19:42 -05:00
KWSys Robot 704ab3d248 KWSys 2013-11-21 (1010d0e3) 
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
 2013-11-25 11:19:37 -05:00
Brad King 5ee1297d6b libarchive: Port upstream issue 320 fix 
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>
 2013-11-25 11:16:45 -05:00
Brad King da6b86f4f0 Merge topic 'doc-generators-cleanup' 
beec9db Help: Organize and revise the cmake-generators.7 manual
 2013-11-25 10:47:15 -05:00
Stephen Kelly 5ee9e6bc11 cmTarget: Add whitelist of properties on INTERFACE_LIBRARY. 2013-11-25 16:23:11 +01:00
Stephen Kelly 0bfcb450e6 INTERFACE_LIBRARY: Avoid codepaths which set unneeded properties. 
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.
 2013-11-25 16:17:50 +01:00
Brad King beec9dbc53 Help: Organize and revise the cmake-generators.7 manual 
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.
 2013-11-25 10:17:18 -05:00
Brad King 9f095b7416 Merge topic 'doc-cmake-language-env-vars' 
45a03aa Help: Document $ENV{VAR} syntax in cmake-language.7 manual
 2013-11-25 09:14:18 -05:00
Brad King 45a03aa654 Help: Document $ENV{VAR} syntax in cmake-language.7 manual 2013-11-25 08:55:28 -05:00
Brad King d6516dc693 Merge topic 'EclipseParallelMakeOnlyOnUnixHosts' 
83751af Eclipse: add -j only on UNIX hosts
 2013-11-25 08:38:07 -05:00
Brad King 788910941f Merge topic 'UseSWIG-fix13772' 
276e373 UseSWIG: Fix .i relative source file location (#13173,#13772,#14459)
 2013-11-25 08:37:59 -05:00
Brad King f1d5d88911 Merge topic 'FindSWIG-fix13771' 
8c127c9 FindSWIG: Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT (#13771)
 2013-11-25 08:37:53 -05:00
Brad King adde0c6324 Merge topic 'FindSWIG-fix13449' 
19b7a54 FindSWIG: Search for swig.swg only on host (#13449)
 2013-11-25 08:37:47 -05:00
Brad King 7008754b0e Merge topic 'FindSWIG-fix13426' 
6620dc7 FindSWIG: Mark SWIG_DIR & SWIG_VERSION as advanced (#13426)
 2013-11-25 08:37:34 -05:00
Brad King da9bde676c Merge topic 'use-generator-target' 
c34968a Port some of the generator API to cmGeneratorTarget.
abb13ea Order cmGeneratorTargetsType elements deterministically.
 2013-11-25 08:37:29 -05:00
Brad King e620ede898 Merge topic 'make-cpack-options-boolean' 
5bc6444 CPack: use IsOn instead of IsSet for boolean CPack options
 2013-11-25 08:37:20 -05:00
Julien Schueller 20028d600f UseSWIG: Remove duplicate include dirs (#14520) 
Shorten the swig command line.
 2013-11-25 08:33:30 -05:00
Julien Schueller acc59e55e1 UseSWIG: Handle a dll name different than module name (#13814) 2013-11-25 08:32:13 -05:00
Julien Schueller 276e3735d8 UseSWIG: Fix .i relative source file location (#13173,#13772,#14459) 2013-11-25 08:29:37 -05:00
Peter Kümmel b6f1142c8b Ninja: multiple commands must be quoted 
Bug 14370
 2013-11-25 12:08:10 +01:00
Peter Kümmel 76a88888bc Ninja: deptype msvc for Intel's compiler on Windows 2013-11-25 09:08:40 +01:00
Kitware Robot ac2acd22dd CMake Nightly Date Stamp 2013-11-25 00:01:06 -05:00
Daniele E. Domenichelli 0e9bf6a257 FindGTK2: Add support for Quartz backend on MAC 
Fix issue #14593
 2013-11-24 14:53:47 +01:00