762108f3ec
Merge topic 'add-cmLocalGenerator-API'
...
223d0efea367416cbbef3c2d12cb3bdc72efa15df2a641d610cf42f5e46ef27053d3a1c94ab2750cc8187f418c6e6dd327916f2c
2015-10-12 10:26:15 -04:00
e0f740f1b1
Always cache entries through the cmake instance.
2015-10-10 15:36:57 +02:00
4f767afe1d
cmMakefile: Remove unneeded container clears.
...
No need to do that in a destructor.
2015-10-09 00:05:14 +02:00
53d3a1c95a
cmMakefile: Remove unused GetProjectName calls.
2015-10-09 00:00:18 +02:00
8c6e6dd3ce
cmMakefile: Inline initialization of project name.
2015-10-09 00:00:18 +02:00
28749903b6
cmState: Internalize the initialization of a snapshot from its parent.
2015-10-07 20:19:42 +02:00
6c02f62f75
Remove now-unused directory setters.
2015-10-07 20:19:42 +02:00
360e4e1db0
Set the current dirs on the snapshot before creating the cmMakefile.
...
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.
2015-10-07 20:19:41 +02:00
f716460ed8
cmMakefile: Move invokation to initialize snapshot.
2015-10-06 21:46:09 +02:00
e67e0155d9
cmMakefile: Avoid name conflict with Solaris global typedef
...
On Solaris there is a global typedef called 'single':
/usr/include/floatingpoint.h:77:15: note: shadowed declaration is here
typedef float single;
Avoid shadowing it by using a different name.
2015-09-30 08:47:02 -04:00
203eada65e
cmMakefile: Remove Configured state.
...
It is vestigial.
2015-09-27 12:08:07 +02:00
c5f07e0537
cmGlobalGenerator: Create local generators after all makefiles configured.
2015-09-24 09:39:38 +02:00
8a88089bbe
cmMakefile: Create the local generator after configuring the makefile.
...
The local generator is not used during configure time.
2015-09-24 09:39:38 +02:00
3e08b4df95
cmMakefile: Skip Global targets for CMP0019 evaluation.
2015-08-28 18:44:39 +02:00
ff8ac8ee6a
cmLocalGenerator: Create from already-constructed cmMakefile.
...
Don't manage the lifetime of the cmMakefile with cmLocalGenerator.
2015-08-28 18:44:39 +02:00
92041eec49
cmGlobalGenerator: Remove MakeLocalGenerator method.
...
Inline implementation to callers.
2015-08-28 18:44:38 +02:00
83b8a927e5
cmMakefile: Remove cmLocalGenerator member.
2015-08-28 18:44:38 +02:00
9b6a743b80
cmLocalGenerator: Remove Parent pointer.
2015-08-28 18:44:38 +02:00
445077cbd2
Merge topic 'minor-cleanups'
...
7f551b4fcd6293cdde6b2895e35ee02d00f2298f6254ba95cf0a78dc
2015-08-27 10:04:12 -04:00
cd6293cdf8
cmMakefile: Fix style.
2015-08-25 23:06:33 +02:00
6254ba9578
cmMakefile: Remove Internal class.
...
Move only remaining state to the direct class.
2015-08-25 22:19:57 +02:00
b3f2299e06
cmState: Move ProjectName from cmMakefile.
2015-08-25 19:57:42 +02:00
6ce940ac97
cmMakefile: Use std::string in ProjectName API.
2015-08-25 19:55:34 +02:00
e8c0341d86
cmMakefile: Out-of-line GetProjectName.
2015-08-25 19:55:32 +02:00
f4150bd88d
cmState: Move directory Properties from cmMakefile.
2015-08-24 20:02:21 +02:00
0178754725
cmMakefile: Inline GetDefinitions into GetProperty.
...
It will soon move to cmState.
2015-08-24 19:48:45 +02:00
2370a99400
Merge topic 'cmState-definitions'
...
bff273916954c8931fc645bd0f070dd325e04ddf4bbe261c
2015-08-24 10:07:04 -04:00
744e6c497c
Fix iOS Bundle layouts ( #15669 )
...
In contrast to Mac OS X App bundle layout the iOS one lacks the
Contents/MacOSX structure. See also the Bundle Structures documentation
in Mac Developer Library:
https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html
For now detect iOS targets by checking the SDK name/path.
2015-08-24 09:50:20 -04:00
bff27391a9
cmState: Host variable definitions.
2015-08-23 19:05:11 +02:00
6954c8936f
cmState: Add a VariableScope snapshot type.
...
Match the scopes currently used in cmMakefile for definitions.
2015-08-23 17:08:54 +02:00
0f070dd3e1
cmMakefile: Decouple the container of cmDefinitions from scoping logic.
...
Maintain a Parent tree node for writing to in RaiseScope.
2015-08-23 17:08:53 +02:00
25e04ddffe
cmDefinitions: Implement in terms of cmLinkedTree.
...
Store the definitions in a cmLinkedTree in the cmMakefile. This can
be moved to cmState and then the tree will provide snapshotting
possibilities. It will also make the Closure copy created at
the start of each cmMakefile unnecesarry.
2015-08-23 17:08:53 +02:00
4bbe261cd3
cmMakefile: Extract InitializeVarScope method.
2015-08-23 17:08:53 +02:00
73e4df99cb
cmGlobalGenerator: Store a container of cmMakefiles.
...
For use at configure-time.
2015-08-07 04:10:28 +02:00
73e3de381d
Merge topic 'cmState-policies'
...
757a1f5452dbe65465a5e0c634835433af0de01c6ae8b30ba5fc17b50a01e6c6f0005bb4
2015-08-06 09:38:24 -04:00
370e2c6785
Merge topic 'refactor-evaluation-files'
...
12c3f2486c0e9ee2
2015-08-06 09:38:22 -04:00
d356bced9b
Merge topic 'fix-missing-subdir-error'
...
c4d2f64f#15680 )
2015-08-06 09:38:17 -04:00
c4d2f64f3c
add_subdirectory: Fix error message on missing CMakeLists.txt ( #15680 )
...
Refactoring in commit v3.3.0-rc1~76^2 (cmMakefile: Handle CMP0014 before
configuring the generator, 2015-05-14) accidentally left the file name
"/CMakeLists.txt" in the error message. Remove it and add a test case.
2015-08-04 16:40:13 -04:00
757a1f5408
cmState: Move PolicyState from cmMakefile.
...
Implement lexical scope checking in terms of the state stack instead
of barriers.
2015-08-02 08:56:57 +02:00
348354333a
cmState: Add Type for policy scope.
2015-08-02 08:56:57 +02:00
12c3f24827
cmGeneratorExpressionEvaluationFile: Require generator context.
...
Avoid storing a cmMakefile as a member, and evaluate in the context of
a cmLocalGenerator instead.
2015-08-01 13:07:11 +02:00
6c0e9ee276
cmMakefile: Store EvaluationFiles.
...
Relieve the cmGlobalGenerator of this responsibility. Evaluate
the generator expressions in the context of the cmLocalGenerator.
2015-08-01 13:07:11 +02:00
6ae8b30bf4
cmMakefile: Move policy barriers inside cmState scopes.
2015-08-01 07:18:34 +02:00
a5fc17b509
cmMakefile: Re-order policy entries and barriers.
...
Make the barriers surround the entries.
2015-08-01 07:18:34 +02:00
610572b7d2
cmMakefile: Simplify generate-time cmGeneratorTarget creation.
2015-07-29 10:43:33 -04:00
34b902a5a6
cmMakefile: Move method out of line.
2015-07-29 10:43:31 -04:00
aaa322a5cb
cmMakefile: Return target from all AddUtilityCommand signatures
2015-07-29 10:43:31 -04:00
280dde34dd
Merge topic 'trace-expand'
...
594bafe5
2015-07-27 09:31:22 -04:00
cb21c548db
Merge topic 'policy-refactor'
...
8329fc015447ca1ad0dcce15658bfc5cf4a258743c45471c71e69fc984e18056
2015-07-27 09:31:18 -04:00
bbb507aebc
cmMakefile: Move the InitializeFromParent method
2015-07-25 14:53:06 +02:00
6ed9c7e024
cmState: Host buildsystem properties for directories.
2015-07-25 14:53:05 +02:00
5447ca1a94
cmMakefile: Remove CMP0001 handling to callers.
2015-07-25 14:48:37 +02:00
d0dcce15f4
cmMakefile: Simplify computation of ancient policy status.
2015-07-25 14:48:37 +02:00
658bfc5c52
cmMakefile: Remove redundant condition from policy status computation.
2015-07-25 14:48:36 +02:00
f4a25874a2
cmMakefile: Inline internal policy status method.
2015-07-25 14:48:36 +02:00
3c45471c2d
cmPolicies: Enable RVO for internal method.
2015-07-25 14:48:36 +02:00
84e1805666
cmMakefile: Convert recursion to loop.
2015-07-25 14:48:36 +02:00
594bafe527
cmake: add --trace-expand option
...
The --trace option is helpful, but sometimes, what you're looking for is
deep under many layers of function calls and figuring out what instance
of the function call you're looking at is tedious to determine (usually
involving patching and message()). Instead, add a --trace-expand option
to trace while expanding commands into what CMake actually sees.
2015-07-23 15:33:10 -04:00
1e77de7411
cmMakefile: Don't clear buildsystem properties.
...
Instead put a sentinal empty entry in the container when a property
is overwritten. Use this sentinal when reading from the containers.
Use iterator::operator+(size_type) directly instead of std::advance,
because this only really makes sense if using RandomAccessIterators.
2015-07-22 21:23:49 +02:00
8d336875b3
cmMakefile: Use Ranges for buildsystem property access.
...
Don't return vector copies.
2015-07-22 20:25:48 +02:00
c7b39d06f9
cmMakefile: Split accessors for include directories and origins.
2015-07-22 20:25:47 +02:00
b2de25aded
cmMakefile: Split accessors for compile options and origins.
2015-07-22 20:25:46 +02:00
d6239507b2
cmMakefile: Split accessors for compile definitions and origins.
2015-07-22 20:25:45 +02:00
ef17bbefd7
cmMakefile: Separate storage of buildsystem properties and their origins.
...
This simplifies some existing and upcoming algorithms.
2015-07-22 20:25:43 +02:00
a89c02ce3d
cmMakefile: Out of line some API.
2015-07-22 20:06:23 +02:00
8ea0b81d20
cmAlgorithms: Rename cmRange to cmMakeRange.
2015-07-22 10:58:19 -04:00
5b2754d41f
Merge topic 'remove-special-MACROS-handling'
...
41bb831f
2015-07-21 09:22:23 -04:00
e13c189743
Merge topic 'remove-special-LINK_DIRECTORIES-handling'
...
881613c435734260
2015-07-21 09:22:21 -04:00
ae64efa1ce
Merge topic 'cmState-Directory'
...
9ebc750227ec21db
2015-07-21 09:22:19 -04:00
93b393e74c
Merge topic 'remove-Properties-accessor'
...
c6055d9dcbe3ee58
2015-07-21 09:22:17 -04:00
64aa41b248
Merge topic 'clean-up-include_regular_expression'
...
4efda261
2015-07-21 09:22:15 -04:00
ce597a022b
Merge topic 'minor-cleanups'
...
cff2dc345505bff72007d11ca622b82952f22616fc1c7cf84dc4570712c82fd8f19653eb
2015-07-21 09:22:13 -04:00
41bb831fc9
cmMakefile: Remove special handling of MACROS property.
2015-07-19 16:01:39 +02:00
9ebc7502b2
cmState: Extract a Directory class.
...
Move Directory-scoped state accessors to it. This will be expanded
with directory property state soon.
2015-07-18 19:37:58 +02:00
cbe3ee58ca
cmMakefile: Add a PropertyKeys accessor.
2015-07-18 18:59:18 +02:00
5505bff7ae
cmMakefile: Add include which we use.
...
Don't rely on this through the cmLocalGenerator include.
2015-07-18 18:40:36 +02:00
4efda261fe
cmMakefile: Remove special handling of INCLUDE_REGULAR_EXPRESSION.
...
It costs an extra cmMakefile member and extra code to maintain in
directory property handling. Remove documentation note that it
is read-only and specify high-level command to populate it.
2015-07-18 14:10:34 +02:00
881613c4ab
cmMakefile: Remove special handling of LINK_DIRECTORIES property.
...
There is no need to handle it in a special way.
2015-07-18 13:56:48 +02:00
357342602d
cmMakefile: Inline only use of GetLinkDirectories.
2015-07-18 13:45:43 +02:00
640fc5b54a
cmMakefile: Remove unused ListFileStack.
2015-07-18 13:27:19 +02:00
54cc0c0e1f
cmMakefile: Port some users of ListFileStack to cmState.
2015-07-18 13:26:06 +02:00
e77c46664c
cmMakefile: Remove obsolete condition.
2015-07-18 13:22:51 +02:00
8e7d303077
cmMakefile: Simplify setting of current snapshot.
2015-07-18 13:17:24 +02:00
6083ec9a78
cmMakefile: Implement LISTFILE_STACK property in terms of cmState.
2015-07-18 13:12:07 +02:00
647b533bce
cmMakefile: Implement FormatListFileStack in terms of cmState.
2015-07-18 13:11:45 +02:00
4dc4570734
cmMakefile: Fix indentation.
2015-07-17 22:14:37 +02:00
12c82fd8c0
cmMakefile: Remove dead code.
2015-07-17 22:14:36 +02:00
d2475bb5c4
cmListFileBacktrace: Implement in terms of cmState::Snapshot.
...
Avoid copying many strings into each backtrace object.
2015-07-06 11:22:42 -04:00
238aac2351
cmListFile: Remove FilePath member from cmListFileContext.
...
There is no need to store the FilePath for every function, as it is
known by other means.
2015-07-06 11:22:41 -04:00
329098a9a0
cmMakefile: Set the FilePath on the frame from the cmState.
...
To verify unit tests pass and for future bisecting.
2015-07-06 11:22:41 -04:00
91158a3369
cmMakefile: Create intermediate variables for snapshot frames.
2015-07-06 11:22:41 -04:00
821f91d6ab
cmMakefile: Create a scoped context for parsing listfiles.
...
Update the Syntax tests to check for updated/improved backtraces.
2015-07-06 11:22:41 -04:00
30d44efaf8
cmMakefile: Access the execution list file from the cmState.
2015-07-06 01:37:17 +02:00
6361f68056
cmState: Store execution context.
...
Extend snapshot creation API to store the file being executed and the
entry point to get to that context.
2015-07-06 01:37:15 +02:00
a8e5446024
cmState: Store snapshots for more different types.
...
Adjust cmMakefile implementation to create the snapshots.
2015-07-04 11:51:27 +02:00
dbafb01580
cmMakefile: Split CallStack into two pieces.
2015-07-04 11:51:27 +02:00
48c6a92b28
cmMakefile: Merge two Scope types and instances.
2015-06-30 23:14:22 +02:00
e28e110d22
cmMakefile: Rename a variable.
2015-06-30 23:14:22 +02:00
3f5200ec5f
cmMakefile: Expand the scope of scoped buildsystem file state.
2015-06-30 23:14:21 +02:00
0a34ea597a
cmMakefile: Compute the filename processed in a scope.
2015-06-30 23:14:21 +02:00
Brad King
Stephen Kelly
Gregor Jasny
Ben Boeckel