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

19705 Commits

Author SHA1 Message Date
Stephen Kelly b8e61d687a Refactor GetCompileDefinitions a bit. 
It is now easier to add generator expressions.
 2012-09-21 13:31:12 +02:00
Stephen Kelly 2c2b25b203 Return a std::string from GetCompileDefinitions. 2012-09-21 13:28:54 +02:00
Stephen Kelly b7e48e0acb Add an AppendDefines std::string overload. 
This makes it easier to use with cmGeneratorTarget::GetCompileDefinitions.
 2012-09-21 13:28:54 +02:00
Stephen Kelly 9a160871d0 Convert paths in INCLUDE_DIRECTORIES property to Unix slashes. 
Duplicate some of the logic from the include_directories command.
 2012-09-21 13:28:54 +02:00
Stephen Kelly 4557c8db48 Don't prepend a path before generator expressions in include_directories. 2012-09-21 13:28:54 +02:00
Stephen Kelly c6abc41eb5 Add include guard for cmGeneratorExpression. 2012-09-21 13:28:54 +02:00
Stephen Kelly 0ff4e3f0b8 Port remaining code to GetCompileDefinitions(). 2012-09-21 13:28:53 +02:00
Stephen Kelly f20af79956 Handle colons as a special case in the generator expression parser. 
Like the special case for commas, this ensures that the colon only has
special meaning as the delimiter between the identifier and the
parameters of a particular expression, but constructs such as

 INCLUDE_DIRECTORIES "$<1:C:\foo>"

are legal.
 2012-09-21 11:33:46 +02:00
Stephen Kelly f178d531a6 Fix indentation in the code blocks generator. 2012-09-21 08:52:24 +02:00
Tom Schutter 301e67e3ba cmake-mode.el: add local keybindings 
Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
 2012-09-21 06:28:24 +02:00
Tom Schutter 6d1e4efd00 cmake-mode.el: Use more readable regex and case-fold-search 
This reimplement ab9824e.

Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
 2012-09-21 06:28:03 +02:00
Kitware Robot bb18bb7f55 CMake Nightly Date Stamp 2012-09-21 00:01:03 -04:00
Stephen Kelly fb578c8635 Fix the regular expression validator for target names. 
Regression introduced by f1eacf0e07.
Target names have different valid contents to config names.
 2012-09-20 12:13:33 +02:00
Stephen Kelly 879fd354c1 Revert "Move GenerateTargetManifest to cmGeneratorTarget." 
This reverts commit 987e12e2f9.

GenerateTargetManifest is called by the global generator before it
creates the generator targets, so we can't move it to cmGeneratorTarget
yet.
 2012-09-20 08:34:30 +02:00
Kitware Robot 7e4a37800c CMake Nightly Date Stamp 2012-09-20 00:01:02 -04:00
Brad King ada9efd3af Clang: All versions know about -fPIE (#13550) 
The GNU compiler information file tests for GNU >= 3.4 because earlier
versions do not have the flag.  The version number test is not valid for
Clang compiler versions, but we know Clang supports the flag.
 2012-09-19 14:08:45 -04:00
Brad King 6e34aea93c Clang: Split Compiler/Clang* modules out from GNU (#13550) 
While Clang presents an almost identical interface to GNU there will be
some differences.  Split the compiler information modules to allow
separate rules for Clang.  Start by loading the GNU rules but leave a
place to add Clang-specific information.
 2012-09-19 14:06:28 -04:00
Brad King 8fc88b7eb0 Merge topic 'vs-link-rsp' 
5598d9b Ninja: don't expand any rsp files
 2012-09-19 13:58:12 -04:00
Brad King d58448544c Merge topic 'ExternalProject-DOWNLOAD_NAME' 
8da0fe4 ExternalProject: Add DOWNLOAD_NAME option
 2012-09-19 13:58:05 -04:00
Brad King 03077c9cbc Merge topic 'file-DOWNLOAD-user-agent' 
14aff4d file(DOWNLOAD): Add HTTP User-Agent string
 2012-09-19 13:58:01 -04:00
Brad King fbe7b3cdfc Merge topic 'vs11-express' 
7ee3cee VS11: Add VS 2012 Express support (#13348)
e17f345 VS11: Detect VS 2012 Express for default generator (#13348)
 2012-09-19 13:57:53 -04:00
Brad King 65af5e90b9 Merge topic 'ninja-rc-compile-flag' 
a1c9c13 Ninja: filter target specific compile flags with language specific regex
 2012-09-19 13:57:47 -04:00
Brad King d1513950fa Merge topic 'document-MSVC-variables-12567' 
f35e35b add documentation for all MSVCxxx version variables (#12567)
 2012-09-19 13:57:44 -04:00
Brad King 816e4ca0eb Merge topic 'osx-clang-target-flags' 
011d5a4 OS X: Add platform-specific Clang compiler info files (#13536)
 2012-09-19 13:57:38 -04:00
Stephen Kelly e83cc94dcd Use the cmGeneratorTarget for the include directories API. 
Also, no need to get the include directories from the target
beforehand. The local generator does that for us anyway.
 2012-09-19 18:45:01 +02:00
Stephen Kelly 9d8e59db71 Merge branch 'use-generator-target' into AutomocUseTargetProperties 2012-09-19 18:33:11 +02:00
Brad King 750fcaa858 VS8: Remove '.NET' from generator description (#10158) 
The product name does not include '.NET'.  Use '8' instead to be
consistent with the existing description of the '9' (2008) generator.
 2012-09-19 12:09:00 -04:00
Peter Kuemmel 5598d9b2a0 Ninja: don't expand any rsp files 2012-09-19 11:40:47 -04:00
Brad King 95a0011604 file(DOWNLOAD): Change EXPECTED_HASH to take ALGO=value 
Make the EXPECTED_HASH option take only a single value instead of two to
avoid handling sub-keyword arguments.  This is also consistent with
URL_HASH in ExternalProject.
 2012-09-19 11:31:36 -04:00
Stephen Kelly 6674583caa Fix compiler warning with initialization order. 2012-09-19 17:16:25 +02:00
Stephen Kelly 5285458342 Add convenience for getting a cmGeneratorTarget to use. 2012-09-19 15:32:25 +02:00
Stephen Kelly c31f3d99f8 Add a wrapper for accessing config-specific compile-definitions. 2012-09-19 15:32:19 +02:00
Stephen Kelly d1446ca7a0 Append the COMPILE_DEFINITIONS from the Makefile to all targets. 
This way we don't need to check the definitions from the Makefile when
generating later, and can more easily add generator expressions.

Duplication is not a problem as the definitions are de-duplicated before
generating.
 2012-09-19 15:32:13 +02:00
Stephen Kelly 290e92ada8 Move GetIncludeDirectories to cmGeneratorTarget. 2012-09-19 15:32:09 +02:00
Stephen Kelly f9146f6b90 Port cmLocalGenerator::GetTargetFlags to cmGeneratorTarget. 2012-09-19 15:31:39 +02:00
Stephen Kelly 9facfd1336 Move GetCreateRuleVariable to cmGeneratorTarget. 2012-09-19 15:31:32 +02:00
Stephen Kelly 78bfee35d5 Make cmLocalGenerator::AddArchitectureFlags take a cmGeneratorTarget. 2012-09-19 15:31:29 +02:00
Stephen Kelly 4f5384e75c Move GetLinkInformation to cmGeneratorTarget 2012-09-19 15:30:57 +02:00
Stephen Kelly 987e12e2f9 Move GenerateTargetManifest to cmGeneratorTarget. 2012-09-19 15:30:49 +02:00
Stephen Kelly 14bf7783f4 Store cmGeneratorTargets with the makefile. 2012-09-19 15:29:07 +02:00
Stephen Kelly f428ca25f5 Add more forwarding API to cmGeneratorTarget. 
This API is the most commonly required in the following patches.
 2012-09-19 15:28:03 +02:00
Brad King d407dcdbc8 Merge topic 'generator-expression-refactor' 
91011bd cmGeneratorExpression: Port users to two-stage processing
f1eacf0 cmGeneratorExpression: Re-write for multi-stage evaluation
 2012-09-19 08:28:16 -04:00
Kitware Robot 281654b5d6 CMake Nightly Date Stamp 2012-09-19 00:01:03 -04:00
Stephen Kelly 91011bd217 cmGeneratorExpression: Port users to two-stage processing 
Removing the Process() API and removing the parameters from the
constructor will allow cmGeneratorExpressions to be cached and evaluated
with multiple configs for example, such as when evaluating target
properties.  This requires the creation of a new compiled representation
of cmGeneratorExpression.  The cmListFileBacktrace remains in the
constructor so that we can record where a particular generator
expression appeared in the CMakeLists file.
 2012-09-18 17:03:08 -04:00
Stephen Kelly f1eacf0e07 cmGeneratorExpression: Re-write for multi-stage evaluation 
The expressions may be parsed and then cached and evaluated multiple
times.  They are evaluated lazily so that literals such as ',' can be
treated as universal parameter separators, and can be processed from
results without appearing literally, and without interfering with the
parsing/evaluation of the entire expression.
 2012-09-18 17:02:23 -04:00
David Cole a24830521b Merge topic 'findsdl-unlimited-main-13262' 
adf7058 FindSDL: add SDLMAIN_LIBRARY only once (#13262)
 2012-09-18 16:42:57 -04:00
David Cole 024bbad230 Merge topic 'cleanup-TLS-and-SSL-interface' 
7369a8f file(DOWNLOAD): Make TLS options behave as documented
131d91a Rename SSL terminology to TLS
 2012-09-18 16:42:47 -04:00
David Cole 893d84b221 Merge topic 'ExternalProject-check-hashes' 
c266461 Add SSL_VERIFYPEER and CAINFO file options to ExternalProject_Add.
beb8a83 ExternalProject: Generalize URL_MD5 option to URL_HASH
 2012-09-18 16:42:39 -04:00
David Cole 2183743f8f Merge topic 'vs-simplify-CreateLocalGenerator' 
f34321a VS: Remove duplicated implementations of CreateLocalGenerator()
 2012-09-18 16:42:30 -04:00
David Cole 9642655c5b Merge topic 'openscenegraph-simplify-fphsa' 
248db6c FindOpenSceneGraph: simplify by using more features of FPHSA
 2012-09-18 16:42:16 -04:00