summaryrefslogtreecommitdiffstats
path: root/Source/cmNinjaTargetGenerator.cxx
Commit message (Collapse)AuthorAgeFilesLines
* Fix the evaluation of per-config COMPILE_DEFINITIONS (#14037)Stephen Kelly2013-03-251-4/+1
| | | | | | | | | | | | | | The API for retrieving per-config COMPILE_DEFINITIONS has long existed because of the COMPILE_DEFINITIONS_<CONFIG> style properties. Ensure that the provided configuration being generated is also used to evaluate the generator expressions in cmTarget::GetCompileDefinitions. Both the generic COMPILE_DEFINITIONS and the config-specific variant need to be evaluated with the requested configuration. This has the side-effect that the COMPILE_DEFINITIONS does not need to be additionally evaluated with no configuration, so the callers can be cleaned up a bit too.
* Ninja: remove implicit dependency on custom command outputsPeter Kümmel2013-02-161-1/+1
| | | | | | | Revert aa2e1e9caef92b10083a03c2ded5c937703e69b8 With this commit all files are rebuild when only one moc file has changed. BUG 0013874
* Move GetCompileDefinitions to cmTarget.Stephen Kelly2013-01-291-2/+2
|
* Process the INTERFACE_PIC property from linked dependenciesStephen Kelly2013-01-101-1/+2
| | | | | | | | | This allows a dependee to inform a target that it should have its POSITION_INDEPENDENT_CODE property set to ON, or OFF. The value of the POSITION_INDEPENDENT_CODE property, if set, must be consistent with any INTERFACE_POSITION_INDEPENDENT_CODE properties on dependees. Add a test covering the consistency checks on platforms where they run.
* Ninja: fix usage of cldeps with ctest launchersMathias Gaunard2012-11-301-7/+9
|
* Revert "Move GetLinkInformation to cmGeneratorTarget"Stephen Kelly2012-11-211-1/+1
| | | | | | | As we can't move all linking related code from cmTarget, it makes sense to reverse the move in some cases. This reverts commit 4f5384e75c6a00d110d3fa3f555a3f6a4f31bb46.
* Merge topic 'fix-INCLUDE_DIRECTORIES-multiconfig'David Cole2012-10-171-2/+4
|\ | | | | | | | | 2a6bd96 Fix config-specific INCLUDE_DIRECTORIES in multi-config generators
| * Fix config-specific INCLUDE_DIRECTORIES in multi-config generatorsStephen Kelly2012-10-171-2/+4
| | | | | | | | | | | | | | | | Commit 08cb4fa4 (Process generator expressions in the INCLUDE_DIRECTORIES property, 2012-09-18) contained an incorrect assumption that CMAKE_BUILD_TYPE was set on the makefile for each generated configuration in multi-config generators. Fix that by making the GetIncludeDirectories API depend on the config.
* | Merge topic 'ninja-custom-command-implicit'Brad King2012-10-091-1/+1
|\ \ | | | | | | | | | | | | aa2e1e9 Ninja: implicit dependency for custom command files
| * | Ninja: implicit dependency for custom command filesPeter Kümmel2012-10-031-1/+1
| |/
* | Merge topic 'ninja-dont-pollute-current-dir'Brad King2012-10-091-2/+12
|\ \ | | | | | | | | | | | | 74fc598 Ninja: don't pollute current dir when using gui (#13495)
| * | Ninja: don't pollute current dir when using gui (#13495)Peter Kümmel2012-10-091-2/+12
| |/
* | Ninja: also set OBJECT_DIR when compilingPeter Kümmel2012-10-031-1/+9
|/ | | | BUG: 0013510
* Merge topic 'vs-pdb-output'Brad King2012-10-011-2/+2
|\ | | | | | | | | | | | | | | 2ccca05 Run PDBDirectoryAndName test on MSVC and Intel efc83b3 Document that PDB_(NAME|OUTPUT_DIRECTORY) are ignored for VS 6 b294457 Verify that PDB_(NAME|OUTPUT_DIRECTORY) are honored in test 3f60dbf Add PDB_OUTPUT_DIRECTORY and PDB_NAME target properties (#10830)
| * Add PDB_OUTPUT_DIRECTORY and PDB_NAME target properties (#10830)Yuchen Deng2012-09-251-2/+2
| | | | | | | | | | | | | | This enables changing the name and output folder of the debug symbol files produced by MS compilers. Inspired-by: Thomas Bernard <thomas.bernard@ipetronik.com>
* | Merge topic 'ninja-OBJECT_DEPENDS'David Cole2012-09-281-4/+3
|\ \ | | | | | | | | | | | | 8f0e08d Ninja: OBJECT_DEPENDS should set an implicit dependency
| * | Ninja: OBJECT_DEPENDS should set an implicit dependencyPeter Kümmel2012-09-251-4/+3
| |/ | | | | | | BUG 13559
* | Merge topic 'use-generator-target'David Cole2012-09-251-11/+5
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 879fd35 Revert "Move GenerateTargetManifest to cmGeneratorTarget." 6674583 Fix compiler warning with initialization order. 5285458 Add convenience for getting a cmGeneratorTarget to use. c31f3d9 Add a wrapper for accessing config-specific compile-definitions. d1446ca Append the COMPILE_DEFINITIONS from the Makefile to all targets. 290e92a Move GetIncludeDirectories to cmGeneratorTarget. f9146f6 Port cmLocalGenerator::GetTargetFlags to cmGeneratorTarget. 9facfd1 Move GetCreateRuleVariable to cmGeneratorTarget. 78bfee3 Make cmLocalGenerator::AddArchitectureFlags take a cmGeneratorTarget. 4f5384e Move GetLinkInformation to cmGeneratorTarget 987e12e Move GenerateTargetManifest to cmGeneratorTarget. 14bf778 Store cmGeneratorTargets with the makefile. f428ca2 Add more forwarding API to cmGeneratorTarget.
| * Add a wrapper for accessing config-specific compile-definitions.Stephen Kelly2012-09-191-2/+2
| |
| * Append the COMPILE_DEFINITIONS from the Makefile to all targets.Stephen Kelly2012-09-191-6/+0
| | | | | | | | | | | | | | | | 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.
| * Move GetIncludeDirectories to cmGeneratorTarget.Stephen Kelly2012-09-191-1/+1
| |
| * Make cmLocalGenerator::AddArchitectureFlags take a cmGeneratorTarget.Stephen Kelly2012-09-191-1/+1
| |
| * Move GetLinkInformation to cmGeneratorTargetStephen Kelly2012-09-191-1/+1
| |
* | Ninja: filter target specific compile flags with language specific regexPeter Kümmel2012-09-181-5/+35
|/ | | | | | | | sync with Makefile code. Bug: 13486 Many thanks to Nils Gladitz
* Ninja: suppress cmcldeps only for source file signature try_compilesPeter Kümmel2012-09-051-2/+1
|
* Merge topic 'ninja-target-pdb-cleanup'David Cole2012-08-241-22/+24
|\ | | | | | | | | | | | | 709fa59 Ninja: remove GetTargetPDB because it is used only once 4bb4787 Ninja:split out setting of msvc TARGET_PDB 59cbc28 Ninja: prepare msvc pdb cleanup
| * Ninja: remove GetTargetPDB because it is used only oncePeter Kümmel2012-08-221-16/+11
| |
| * Ninja:split out setting of msvc TARGET_PDBPeter Kümmel2012-08-221-13/+18
| |
| * Ninja: prepare msvc pdb cleanupPeter Kümmel2012-08-221-2/+4
| |
* | Merge topic 'compile-definitions-unique'David Cole2012-08-241-16/+13
|\ \ | |/ |/| | | | | | | | | | | f0a1065 Rename files from main.cpp to more meaningful names. ca7fb14 Fix the test setting COMPILE_DEFINITIONS target property 733deb6 Fix CompileDefinitions test on Visual Studio. 3dae652 Don't duplicate -D defines sent to the compiler.
| * Don't duplicate -D defines sent to the compiler.Stephen Kelly2012-08-201-16/+13
| | | | | | | | | | | | | | | | | | | | | | There is no need to do so. Be consistent with include directories and ensure uniqueness. This requires changing the API of the cmLocalGenerator::AppendDefines method, and changing the generators to match. The test unfortunately can't test for uniqueness, but it at least verifies that nothing gets lost.
* | Ninja: don't crash on returned 0 pointerPeter Kümmel2012-08-171-21/+18
| |
* | Ninja: cmcldeps needs a compilerPeter Kümmel2012-08-171-4/+7
|/
* Merge topic 'ninja-fix-macosx'David Cole2012-07-241-2/+49
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fc8df9 Add missing this->. 7a3ecf5 Fix memory leak in Makefile generator. 9f7dc83 Ninja: also bootstrap ninja files 5d365b2 Ninja: enable ninja support everywhere d569f3e Ninja: void function can't return a value 52160bf Ninja: enable ninja on Mac so all Mac CDash-builds are tested, cleanup later 56aeac6 Ninja: fixes for bcc 7a6bc9e Ninja: remove 'this' from member initializer list 44ba4cf Ninja: remove warnings 7751966 Ninja: remove 'friend' in ninja code c3988ee Re-factor OS X content generator start up. f8e0a51 Re-factor framework directory computation. f36c7b0 Re-factor Mac OS X content directory computation. 5d885db Re-factor bundle content copying rules generation. 3b2a01e Ninja: Use same echo message as makefiles. 7bb56c5 Re-factor CFBundle generation. ...
| * Add missing this->.Nicolas Despres2012-07-221-1/+1
| |
| * Ninja: remove warningsPeter Kümmel2012-07-181-10/+5
| |
| * Ninja: remove 'friend' in ninja codePeter Kümmel2012-07-181-1/+1
| |
| * Re-factor OS X content generator start up.Nicolas Despres2012-07-171-12/+1
| |
| * Re-factor bundle content copying rules generation.Nicolas Despres2012-07-171-26/+24
| |
| * Ninja: Copy resource files in the bundle.Nicolas Despres2012-07-171-1/+66
| | | | | | | | This patch fixes test BundleTest on Darwin.
* | Ninja: cmcldeps needs absolute paths for RCsPeter Kümmel2012-07-171-2/+6
| |
* | Ninja: also stop when .rc's .d file couldn't be generatedPeter Kümmel2012-07-151-2/+4
|/ | | | | | prevents silent disappearing of .d files for resource files. cmcldeps changes directory for cl call, so relativ include paths do not work.
* Merge topic 'Ninja-absolute-compile-commands'David Cole2012-07-091-2/+14
|\ | | | | | | | | | | | | ca403b8 Construct the full path before escaping it. f9383a9 STYLE: Fix line length, remove extra blank line e30d46e Use full paths in compile_commands.json for out of source builds.
| * Construct the full path before escaping it.Stephen Kelly2012-06-201-4/+7
| | | | | | | | Should fix some dashboard errors.
| * STYLE: Fix line length, remove extra blank lineDavid Cole2012-06-191-2/+2
| |
| * Use full paths in compile_commands.json for out of source builds.Stephen Kelly2012-06-191-0/+9
| | | | | | | | | | | | | | Clang tooling requires that paths in the directory and file JSON fields are relative to the directory field, but clang doesn't normalize the paths already. The result is that clang doesn't find the relevant entry for files which begin with ../.
* | Merge topic 'ninja-cldeps'David Cole2012-06-191-18/+77
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb410e8 Ninja: disable cldeps for bcc32, it's too old, and ninja would also not build 5ead31d Ninja: try work around for bcc32 bug 1333b57 Ninja: build server fixes 9081e3a remove warning about unused parameter f430bea Ninja: maybe this fixes the bcc32 build f2c1288 Ninja: msvc6 for-scoping 44b9bbc Ninja: build with old msvc versions 57156a5 Ninja: build server fixes f1abdce Ninja: some bytes of the rc files couldn't be piped correctly 2de963d Ninja: don't remove space between command and parameters 50b6f33 Ninja: build cmcldeps with mingw c05653e Ninja: try to make GetProcessId visible ab245ff Ninja: but cl supports /nologo ... bf58e9a Ninja: no /nologo option in old rc.exe 2fb07fc Ninja: Eclipse and KDevelop fixes for ninja 518c065 Ninja: don't pollute build dir with preprocessed rc files ...
| * Ninja: extract dependencies for .rc files with msvc toolsPeter Kuemmel2012-06-131-5/+8
| | | | | | | | | | | | | | | | rc.exe doesn't support /showIncludes. Because .rc files also #include stuff we can misuse cl.exe to get the included files. Done one the fly by cmcldeps.
| * Ninja: work with ninja/master, don't compile rc files with clPeter Kuemmel2012-06-121-18/+41
| | | | | | | | | | Ninja generates for paths with spaces wrong results for $out.d, using the new DEP_FILE variable instead.
| * Ninja: use slashes for include dirs, so also slahes are in the .d filesPeter Kuemmel2012-06-121-0/+2
| |