David Cole
046f0f869e
Merge topic 'ninja-generated-def'
...
3fd0dde
Merge branch 'test-generated-def' into ninja-generated-def
d2c764a
Ninja: Fix module .def file path conversion
2012-04-03 15:59:48 -04:00
Brad King
d2c764ad8d
Ninja: Fix module .def file path conversion
...
Refactoring in commit a2514f15
(Simplify cmNinjaTargetGenerator using
cmGeneratorTarget, 2012-03-13) accidentally removed mapping of .def file
paths through ConvertToNinjaPath (via GetSourceFilePath). Take the
ModuleDefinitionFile value from cmGeneratorTarget and map it correctly
through ConvertToNinjaPath.
In addition to generating cleaner paths in the ninja build files this
correctly links up references to a generated .def file with the custom
command output that produces it.
2012-04-02 10:58:56 -04:00
David Cole
ef309e94cb
Merge topic 'ninja-generator'
...
6b5614f
Ninja: Substitute <OBJECT> and <CMAKE_C_COMPILER> in depfile flags
2012-03-27 15:56:13 -04:00
Peter Collingbourne
6b5614f164
Ninja: Substitute <OBJECT> and <CMAKE_C_COMPILER> in depfile flags
...
Patch by Amine Khaldi!
Also, start using the -MT flag to set a target name for depfiles.
This works around a bug observed in distcc, as explained in the
comment. Based on a patch by Alexander Usov.
2012-03-26 04:46:12 +01:00
David Cole
31c0bc0219
Merge topic 'object-library'
...
93d5509
Merge branch 'ninja-object-library' into object-library
821037c
Merge branch 'xcode-object-library' into object-library
eb24c99
Merge branch 'object-library' into xcode-object-library
63d1be8
Xcode: Honor $<TARGET_OBJECTS:...> source expressions
020ba38
Merge branch 'object-library' into xcode-object-library
e8ea615
Build object library targets in Xcode
8045e17
Pre-compute object file names before Xcode generation
247a132
Allow txt files as ExtraSources in object library targets
b063599
Add a default source group for object files.
be01f3b
Xcode: Re-factor some existing methods into "FromPath" variants
2693dbe
Merge branch 'object-library' into ninja-object-library
51997cb
Ninja: Honor $<TARGET_OBJECTS:...> source expressions
23ec258
Merge branch 'object-library' into ninja-object-library
61124de
Build object library targets in Ninja
f5b06cd
Pre-compute object file names before Ninja generation
a2514f1
Simplify cmNinjaTargetGenerator using cmGeneratorTarget
...
2012-03-20 09:34:35 -04:00
Peter Collingbourne
df847671b4
Ninja: add support for OBJECT_OUTPUTS, fix PrecompiledHeader test case
2012-03-17 23:16:40 +00:00
Brad King
51997cb6dc
Ninja: Honor $<TARGET_OBJECTS:...> source expressions
...
Add objects from object libraries referenced using this syntax to the
set of objects linked in a target.
2012-03-16 10:19:44 -04:00
Brad King
61124de4c0
Build object library targets in Ninja
...
Treat OBJECT libraries as STATIC libraries but leave out the archive
step. The object files will be left behind for reference by other
targets later.
2012-03-16 10:18:36 -04:00
Brad King
a2514f15fa
Simplify cmNinjaTargetGenerator using cmGeneratorTarget
...
Replace the classification of source files in this generator using that
computed by cmGeneratorTarget.
2012-03-16 10:18:35 -04:00
Brad King
f5b06cda0f
Pre-compute object file names before Ninja generation
...
Implement cmGlobalGenerator::ComputeTargetObjects in the Ninja generator
to pre-compute all the object file names. Use the results during
generation instead of re-computing it later.
2012-03-16 10:18:35 -04:00
Bill Hoffman
bba37dd517
Ninja: Fix for PDB files with spaces in the path.
...
This calls ConvertToOutputFormat on the PDB paths for pdb file paths
used in both library creation and the building of object files.
2012-03-16 10:16:45 -04:00
Peter Kuemmel
dbe3dce546
Ninja: add .def file support
2012-03-07 16:24:34 -05:00
Peter Collingbourne
80ff2102a4
Ninja: Use cmSystemTools::ExpandListArgument to split compile/link commands
2012-02-27 04:05:38 +00:00
David Cole
eabc9b0bc5
Ninja: CMake: Adapt Ninja generator for per-target include dirs
...
The confluence of the ninja-generator and target-include-directories
branches conspired to produce a nice little compiler error when
they were both merged into 'next'...
Yay for Continuous dashboards!
2012-02-22 16:31:00 -05:00
Peter Kuemmel
54bd175eea
Ninja: windows msvc: create for each target a .pdb file
2012-02-21 21:18:05 +01:00
Peter Collingbourne
a1a30340a2
Ninja: Import library support for Windows
2012-02-19 23:20:03 +00:00
Peter Kuemmel
21997cea4d
Ninja: mark the Windows specific hacks with a comment only
2012-02-19 19:21:05 +01:00
Peter Kuemmel
adb54f3dbf
Ninja: add some hacks for Windows
2012-02-19 11:30:07 +01:00
Peter Collingbourne
cea03e632b
Ninja: Backslash rules for Windows
...
Generally these are only required in build statements, as Ninja wants
to be able to chop paths up. But it doesn't hurt to also try to use
them in command line arguments.
2012-02-19 04:00:02 +00:00
Peter Collingbourne
6dd410c2b9
Ninja: Add the Ninja generator
2012-02-02 23:40:21 +00:00