summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.h
Commit message (Collapse)AuthorAgeFilesLines
* cmExportTryCompileFileGenerator: Port to cmGeneratorTarget.Stephen Kelly2015-10-181-0/+3
|
* cmGlobalGenerator: Compute export() related classes early.Stephen Kelly2015-10-181-2/+2
| | | | Simplify CMP0024 handling.
* Genex: Port some access API to cmGeneratorTarget.Stephen Kelly2015-10-151-3/+3
|
* cmMakefile: Store container of cmExportBuildFileGenerators.Stephen Kelly2015-10-141-2/+5
| | | | | | | | | Set a cmLocalGenerator on each instance at compute time. That will soon be needed to access cmGeneratorTarget instances. If a cmExportBuildFileGenerator is processed early during configure time as a result of CMP0024 it must be removed from the list to process later at generate time.
* cmGeneratorTarget: Move GetSupportDirectory from cmTarget.Stephen Kelly2015-10-121-1/+1
|
* Merge topic 'refactor-computation'Brad King2015-10-061-1/+2
|\ | | | | | | | | | | | | | | | | | | | | 616f0311 cmGlobalGenerator: Move path computation to Compute. 9eea0486 cmGlobalGenerator: Do more computation at compute time. 2eca0559 cmGlobalGenerator: De-virtualize Compute(). 21f428f4 VisualStudio: Replace Compute override with AddExtraIDETargets override. a9588e90 VisualStudio10: Initialize the LongestSource at generate time. 4407eee0 cmGlobalGenerator: Call AddExtraIDETargets as a hook of Compute(). a09c545d Xcode: Extract a AddExtraIDETargets method.
| * cmGlobalGenerator: De-virtualize Compute().Stephen Kelly2015-10-051-1/+1
| | | | | | | | It now implements the NVI pattern.
| * cmGlobalGenerator: Call AddExtraIDETargets as a hook of Compute().Stephen Kelly2015-10-051-0/+1
| | | | | | | | Relieve the Xcode generator of having to reimplement Compute().
* | QtAutogen: Port global generator to cmGeneratorTarget.Stephen Kelly2015-10-051-1/+1
|/
* Merge topic 'fix-qtautogen-with-object-library-Ninja'Brad King2015-09-291-1/+0
|\ | | | | | | | | 9bc6eb8e cmGlobalGenerator: Initialize generator targets on construction (#15729)
| * cmGlobalGenerator: Initialize generator targets on construction (#15729)Stephen Kelly2015-09-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja generator and Visual Studio generators are special-cased for the QtAutogen feature. In order to reduce the number of custom targets, the Visual Studio generators prefer to create custom commands instead, and in order to create appropriate Ninja files, generated rcc files are listed as byproducts. This requires the use of the GetConfigCommonSourceFiles API of the cmGeneratorTarget for those generators when initializing the autogen target. The initializer method is called from Compute() after the cmGeneratorTarget objects are created, however the initialization of the object directory occurs later in the InitGeneratorTargets method. That means that the resulting object locations are computed incorrectly and cached before the object directory is determined, so the generated buildsystem can not find the object files. The initialization of the object directory was split from the creation of cmGeneratorTarget instances in commit 0e0258c8 (cmGlobalGenerator: Split creation of generator object from initialization., 2015-07-25). The motivation for the split was to do only what is essential to do early in cases where cmGeneratorTargets need to be created at configure-time. That is required for the purpose of implementing policies CMP0024 and CMP0026, and for try_compile(LINK_LIBRARIES). However, the split was not really necessary. Compute the object directory in the cmGeneratorTarget constructor instead. The QtAutogen unit test already tests the use of TARGET_OBJECTS with AUTOMOC, and that test already passes on Ninja. The reason it already passes is that the QtAutogen target also uses the AUTORCC feature, and specifies several qrc files in its SOURCES. Later in the Compute algorithm (after the InitGeneratorTargets call), the rcc files are determined and target->AddSource is called. The AddSource call clears the previously mentioned cache of source files, causing it to be regenerated when next queried, this time taking account of the object directory. Extend the test suite with a new target which does not make use of AUTORCC with qrc files so that the test added alone would break without the fix in this commit.
* | Merge topic 'simplify-qt-autogen'Brad King2015-09-291-4/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fe39020 QtAutogen: Port away from cmLocalGenerator. 59a729b2 QtAutogen: Split initializer class into separate file. 1e83a963 QtAutogen: Split initializer methods into separate class. 12f0e13c QtAutogen: Simplify generator initialization API. 65ff75d3 QtAutogen: Remove unnecessary dereference. 64b78c14 QtAutogen: Move Source initialization to prior loop. c3c20d3c QtAutogen: Add _automoc.cpp sources before initializing. 8b6ec29d QtAutogen: Move initialization condition to caller. 9470b056 QtAutogen: Move condition to prior loop. b7491b1c QtAutogen: Move condition to prior loop. e791c854 QtAutogen: Make some methods static. 6210ec64 QtAutogen: Make internal method private. a3ceb998 QtAutogen: Don't use members to initialize automoc targets. dced2fe1 QtAutogen: Rename variable. f9a77e76 QtAutogen: Don't use a member to store skipped uic files. c3633e7a QtAutogen: Add missing includes and forward declarations.
| * QtAutogen: Simplify generator initialization API.Stephen Kelly2015-09-261-4/+1
| |
* | cmGlobalGenerator: Devirtualize method.Stephen Kelly2015-09-271-1/+1
|/
* cmGlobalGenerator: Remove unused method.Stephen Kelly2015-09-241-1/+0
|
* cmGlobalGenerator: Create local generators after all makefiles configured.Stephen Kelly2015-09-241-0/+2
|
* cmGlobalGenerator: Add API for the configure step being finished.Stephen Kelly2015-09-181-0/+3
|
* cmGlobalGenerator: Rename method.Stephen Kelly2015-08-281-1/+1
|
* cmLocalGenerator: Create from already-constructed cmMakefile.Stephen Kelly2015-08-281-1/+1
| | | | Don't manage the lifetime of the cmMakefile with cmLocalGenerator.
* cmGlobalGenerator: Remove MakeLocalGenerator method.Stephen Kelly2015-08-281-5/+2
| | | | Inline implementation to callers.
* cmLocalGenerator: Remove Parent pointer.Stephen Kelly2015-08-281-5/+3
|
* Merge topic 'minor-cleanups'Brad King2015-08-271-1/+1
|\ | | | | | | | | | | | | | | | | | | | | 7f551b4f cmGlobalGenerator: Implement VS6 check without virtual method. cd6293cd cmMakefile: Fix style. de6b2895 cmTarget: Remove vestigal method declaration. e35ee02d cmTarget: Fix indentation. 00f2298f Reduce uses of cmMakefile::GetGlobalGenerator. 6254ba95 cmMakefile: Remove Internal class. cf0a78dc cmGeneratorTarget: Issue messages through the local generator.
| * cmGlobalGenerator: Implement VS6 check without virtual method.Stephen Kelly2015-08-251-1/+1
| | | | | | | | Don't require existence of a global generator for this check.
* | cmGlobalGenerator: Extract new IsExcluded overload.Stephen Kelly2015-08-241-0/+2
|/
* cmGlobalGenerator: Rename progress initializer method.Stephen Kelly2015-08-231-1/+1
|
* cmGlobalGenerator: Move LG to target map to subclass.Stephen Kelly2015-08-231-3/+1
| | | | This is the only user.
* Merge topic 'global-generator-makefiles'Brad King2015-08-111-0/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * cmGlobalGenerator: Port Find API to cmMakefile.Stephen Kelly2015-08-071-0/+1
| |
| * cmGlobalGenerator: Store a container of cmMakefiles.Stephen Kelly2015-08-071-0/+4
| | | | | | | | For use at configure-time.
* | Merge topic 'rm-Makefile-LocalGenerator'Brad King2015-08-111-1/+1
|\ \ | | | | | | | | | | | | | | | 1689c91d cmMakefile: Remove unused method. dd11f72c cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.
| * | cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.Stephen Kelly2015-08-061-1/+1
| |/
* | nmake/jom: Only warn about bad VS environment if compiler not found.James Johnston2015-08-061-2/+2
|/ | | | | | | nmake and jom generators no longer warn about missing INCLUDE/LIB environment variables unless the C/CXX compiler cannot be found. This is useful if the user does not want to use these generators with the Visual C++ compiler, or they do not want to enable any language.
* cmMakefile: Store EvaluationFiles.Stephen Kelly2015-08-011-8/+0
| | | | | Relieve the cmGlobalGenerator of this responsibility. Evaluate the generator expressions in the context of the cmLocalGenerator.
* cmGlobalGenerator: Virtualize the Compute step and override it.Stephen Kelly2015-07-301-1/+1
|
* cmGlobalGenerator: Return from Compute whether to generate.Stephen Kelly2015-07-291-1/+1
|
* cmGlobalGenerator: Create a new Compute step before generation.Stephen Kelly2015-07-291-3/+2
| | | | Replace the DoGenerate method.
* cmGlobalGenerator: Remove the TargetManifest member.Stephen Kelly2015-07-291-5/+1
|
* cmGlobalGenerator: Remove unused manifest accessor.Stephen Kelly2015-07-291-5/+0
|
* cmExportTryCompileFileGenerator: Create cmGeneratorTargets.Stephen Kelly2015-07-271-3/+9
| | | | | This is not a deprecated behavior, but only requires IMPORTED targets be made.
* cmGlobalGenerator: Create cmGeneratorTargets before QtAutomoc.Stephen Kelly2015-07-271-0/+5
| | | | Add cmGeneratorTargets as needed in the QtAutomoc processing.
* cmGlobalGenerator: Extract method to create generator objects.Stephen Kelly2015-07-271-0/+2
|
* cmGlobalGenerator: Split creation of generator object from initialization.Stephen Kelly2015-07-271-0/+1
|
* cmGlobalGenerator: Map local generators to generator targets.Stephen Kelly2015-07-011-1/+1
|
* cmComputeTargetDepends: Change API to use cmGeneratorTarget.Stephen Kelly2015-07-011-3/+4
|
* cmGlobalGenerator: Create GeneratorTargets with a local generator.Stephen Kelly2015-06-221-1/+1
|
* cmGlobalGenerator: Re-arrange data layout.Stephen Kelly2015-06-071-6/+8
| | | | Size goes from 1488 to 1480 bytes.
* Merge topic 'cmMakefile-Configure'Brad King2015-06-041-5/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | 7657e8b1 cmMakefile: Introduce a local cmMakefile variable. 4e8f242d cmMakefile: Store unconfigured cmMakefiles. d65e0123 cmMakefile: Implement ConfigureSubDirectory in terms of cmMakefile. f059ed16 cmMakefile: Move Configure responsibility from cmLocalGenerator. a653611d cmake: Replace CurrentLocalGenerator concept with CurrentMakefile. 69a038a9 cmMakefile: Refactor directories specified with the subdirs command. 08637970 cmLocalGenerator: ComputeObjectMaxPath just before generating. 27e11c6f Merge Configure state with GeneratingBuildSystem state. 363caa2f cmLocalGenerator: De-virtualize Configure().
| * cmake: Replace CurrentLocalGenerator concept with CurrentMakefile.Stephen Kelly2015-06-041-5/+7
| |
* | VS: Compute project GUIDs deterministicallyBrad King2015-06-041-2/+0
|/ | | | | | | | | Compute deterministic GUIDs that are unique to the build tree by hashing the path to the build tree with the GUID logical name. Avoid storing them in the cache, but honor any found there. This will allow project GUIDs to be reproduced in a fresh build tree so long as its path is the same as the original, which may be useful for incremental builds.
* cmLocalGenerator: Require a valid cmState::Snapshot in the ctor.Stephen Kelly2015-05-271-2/+6
| | | | | | | | | | | Refactor the local generator creation API to accept a cmState::Snapshot. Adjust MakeLocalGenerator to use the 'current' snapshot in cases where there is no parent. Create the snapshot for subdirectories in cmMakefile::AddSubdirectory. This means that snapshots are now created at the point of extending the tree, as appropriate, and independently of the cmLocalGenerator and cmMakefile they represent the state for.