summaryrefslogtreecommitdiffstats
path: root/Source/cmQtAutoGenerators.cxx
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Automoc: Fix support of files with the same name (#12873)"Brad King2016-02-191-32/+3
| | | | | | | | | | This reverts commit 9beb2744d7685fca9cd5717308d4457dffdefcdc. Our AUTOMOC documentation states that it should be possible to `#include "moc_foo.cpp"` in `foo.cpp`, and this will not work if the file is placed in a different directory. Another solution will need to be found to the original problem. Reported-by: Stephen Kelly <steveire@gmail.com>
* Automoc: Fix support of files with the same name (#12873)Mariusz Pluciński2016-02-161-3/+32
|
* cmake: Store hardcoded lists of sources and headersStephen Kelly2015-10-271-1/+1
| | | | Don't duplicate this in each cmMakefile.
* cmState: Initialize default definitions immediately.Stephen Kelly2015-10-131-0/+1
| | | | Don't leave this as cmMakefile responsibility.
* Set the current dirs on the snapshot before creating the cmMakefile.Stephen Kelly2015-10-071-2/+3
| | | | | | The cmMakefile should get a fully prepared snapshot and not clobber its definitions. It should eventually be able to process list files from any starting-point snapshot, though that is some refactoring away still.
* QtAutogen: Port away from cmLocalGenerator.Stephen Kelly2015-09-291-8/+7
|
* QtAutogen: Split initializer class into separate file.Stephen Kelly2015-09-291-1049/+8
|
* QtAutogen: Split initializer methods into separate class.Stephen Kelly2015-09-261-22/+31
|
* QtAutogen: Add _automoc.cpp sources before initializing.Stephen Kelly2015-09-261-2/+15
|
* QtAutogen: Move initialization condition to caller.Stephen Kelly2015-09-261-13/+1
|
* QtAutogen: Make some methods static.Stephen Kelly2015-09-261-12/+15
|
* QtAutogen: Don't use members to initialize automoc targets.Stephen Kelly2015-09-261-19/+17
|
* QtAutogen: Rename variable.Stephen Kelly2015-09-261-2/+3
|
* QtAutogen: Don't use a member to store skipped uic files.Stephen Kelly2015-09-261-11/+9
|
* cmLocalGenerator: Create from already-constructed cmMakefile.Stephen Kelly2015-08-281-1/+2
| | | | Don't manage the lifetime of the cmMakefile with cmLocalGenerator.
* QtAutogen: Use a smart pointer.Stephen Kelly2015-08-281-2/+1
|
* cmGlobalGenerator: Remove MakeLocalGenerator method.Stephen Kelly2015-08-281-1/+1
| | | | Inline implementation to callers.
* cmGlobalGenerator: Require a snapshot to create a local generator.Stephen Kelly2015-08-281-1/+2
|
* cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.Stephen Kelly2015-08-261-3/+11
|
* cmGeneratorTarget: Move compile defintions processing from cmTarget.Stephen Kelly2015-08-261-2/+0
|
* Remove use of include <cmsys/ios/*> and cmsys_ios::*Brad King2015-08-201-3/+2
| | | | We no longer need this compatibility layer for the compilers we support.
* Merge topic 'global-generator-makefiles'Brad King2015-08-111-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d8a125e cmQtAutoGenerators: Prefer a generator to access global generator. 5f66900e cmGlobalGenerator: Port Find API to cmMakefile. c5b8841f cmGlobalGenerator: Create global targets from cmMakefiles. 8f75ea3b cmGlobalGenerator: Port global target creation to cmMakefile. 56f0540b cmGlobalGenerator: Port Configure-time check to cmMakefile. 19b546ef cmGlobalGenerator: Base final target property computation on Makefiles. f8be9ba9 cmGlobalGenerator: Base progress on Makefiles, not LocalGenerators. bc1097e3 cmExportLibraryDependenciesCommand: Port to cmMakefile. 204aecdf cmGlobalGenerator: Port configure-time code to cmMakefile. 3dd6f0a5 cmake: Port configure-time code to cmMakefile. 73e4df99 cmGlobalGenerator: Store a container of cmMakefiles. 19369937 cmGeneratorTarget: Port internal type to cmGeneratorTarget. 32f131b0 cmGeneratorTarget: Prefer the local generator to access the global.
| * cmQtAutoGenerators: Prefer a generator to access global generator.Stephen Kelly2015-08-071-2/+2
| |
* | cmTarget: Split storage of include directories from genexes.Stephen Kelly2015-08-071-0/+2
|/
* cmGeneratorTarget: Move LinkInterfaceDependent methods from cmTarget.Stephen Kelly2015-08-051-3/+8
|
* cmGeneratorTarget: Move GetAutoUicOptions from cmTarget.Stephen Kelly2015-08-051-1/+4
|
* cmMakefile: Simplify generate-time cmGeneratorTarget creation.Stephen Kelly2015-07-291-1/+0
|
* cmTarget: Restore the ImportedGetLocation method.Stephen Kelly2015-07-271-6/+10
| | | | | | It was removed in commit f154475b (cmTarget: Refactor GetLocation API, 2014-03-08), but it is more readable for targets we know are imported.
* cmGlobalGenerator: Create cmGeneratorTargets before QtAutomoc.Stephen Kelly2015-07-271-1/+6
| | | | Add cmGeneratorTargets as needed in the QtAutomoc processing.
* Merge topic 'autorcc-qt-5.1'Brad King2015-07-101-1/+1
|\ | | | | | | | | 9a271e13 cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
| * cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)Brad King2015-07-091-1/+1
| | | | | | | | | | | | | | | | In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their input changes, 2014-09-17) we added use of the rcc "--list" option. Prior to Qt 5.2 this option was called just "-list", and the older name is still supported by the newer tools. Use the older name of the option for compatibility with Qt 5.0 and 5.1.
* | Merge topic 'use-generator-target'Brad King2015-06-231-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7714235 Get the local generator from the GeneratorTarget. 5aa556be cmMakefileTargetGenerator: Require cmGeneratorTarget. bb88668a cmNinjaGenerator: Require cmGeneratorTarget. a3b210fd cmGeneratorTarget: Require a cmLocalGenerator to construct. 8ec60c67 cmGlobalGenerator: Create GeneratorTargets with a local generator. dee197fe GHS: Use a cmGeneratorTarget in generator API. b2b41b83 cmGeneratorTarget: Add accessor for cmLocalGenerator. 2e9333a1 C::B: Get the Makefile from the LocalGenerator, not vice-versa.
| * | Get the local generator from the GeneratorTarget.Stephen Kelly2015-06-221-3/+3
| | | | | | | | | | | | The Makefile should not know the LocalGenerator at all
* | | Merge topic 'qt-autogen-always-run'Brad King2015-06-231-21/+4
|\ \ \ | |/ / |/| | | | | | | | | | | 2bf22a4b QtAutogen: Add comment explaining why rcc cannot use PRE_BUILD 0e346427 QtAutogen: Always run autogen step even when rcc is enabled (#15608)
| * | QtAutogen: Add comment explaining why rcc cannot use PRE_BUILDBrad King2015-06-231-0/+3
| | |
| * | QtAutogen: Always run autogen step even when rcc is enabled (#15608)Brad King2015-06-191-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their input changes, 2014-09-17) the "cmake -E cmake_autogen" rule was switched from always running to running as a custom command with dependencies if rcc is enabled. This is not correct because automoc always needs to re-run. Switch back to always running the command.
* | | QtAutogen: Get the global generator from the Makefile.Stephen Kelly2015-06-211-2/+1
|/ /
* | Fix preprocessor checks WIN32 => _WIN32Brad King2015-06-151-1/+1
| | | | | | | | | | | | The latter is predefined by Windows toolchains and is more reliable. Reported-by: Michael Stürmer <michael.stuermer@schaeffler.com>
* | Port static calls from cmLocalGenerator to cmOutputConverter.Stephen Kelly2015-06-061-20/+20
| |
* | cmake: Replace CurrentLocalGenerator concept with CurrentMakefile.Stephen Kelly2015-06-041-1/+1
|/
* cmGlobalGenerator: Require a cmake instance in ctor.Stephen Kelly2015-05-271-2/+1
| | | | It is required anyway, so this makes it explicit.
* Merge topic 'clean-up-CMAKE_COMMAND'Brad King2015-05-211-1/+1
|\ | | | | | | | | 6fbd4cae Use cmSystemTools::GetCMakeCommand() to get path to cmake internally
| * Use cmSystemTools::GetCMakeCommand() to get path to cmake internallyBrad King2015-05-201-1/+1
| | | | | | | | | | This is much simpler than finding a way to lookup "CMAKE_COMMAND" everywhere.
* | QtAutogen: Create global generator on the stack.Stephen Kelly2015-05-191-6/+4
| |
* | QtAutogen: Use a more-obvious delete-target.Stephen Kelly2015-05-191-1/+1
| |
* | QtAutogen: Remove the need for a local makefile variable.Stephen Kelly2015-05-191-6/+3
| |
* | QtAutogen: Inline static factory method.Stephen Kelly2015-05-191-14/+7
| |
* | QtAutogen: Remove repeated setters.Stephen Kelly2015-05-191-3/+0
|/ | | | These methods are called already just before calling the static method.
* Merge topic 'clean-up-vs-generators'Brad King2015-05-191-4/+4
|\ | | | | | | | | | | | | dad8b03f VS: Remove obsolete methods. e435f875 VS: Move version information to global generator. b5f093f0 VS: Simplify setting of flag table.
| * VS: Move version information to global generator.Stephen Kelly2015-05-191-4/+4
| |
generated by cgit v0.12 at 2024-11-12 01:37:14 (GMT)