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
be5997ef77
cmMakefile: Inline ProcessBuildsystemFile into only caller.
2015-06-30 23:14:21 +02:00
5bf9bfda3f
cmMakefile: Don't use string comparison to check directory level.
2015-06-30 23:14:20 +02:00
f346d88d10
cmMakefile: Avoid invoking EnforceDirectoryLevelRules.
...
This is part of the CMP0000 implementation and only needs to be invoked
for top-level buildsystem files currently.
2015-06-30 23:14:20 +02:00
b661403177
cmMakefile: Add filename to ReadListFile auto scopes.
2015-06-30 23:14:19 +02:00
6708d21664
cmMakefile: Remove IncludeScope Quiet call.
2015-06-30 23:14:19 +02:00
0818737c85
cmMakefile: Make listfile scopes responsible for logical checks.
...
Remove the LexicalPushPop.
2015-06-30 23:14:18 +02:00
dd7e42758d
cmMakefile: Move the lexical scope.
2015-06-30 23:14:18 +02:00
92cecd9369
cmMakefile: Add automatic scopes to listfile readers.
2015-06-30 23:14:18 +02:00
276c62253e
cmMakefile: Move the IncludeScope to where it is used.
2015-06-30 23:14:17 +02:00
5ab7dd544e
Merge topic 'fix-function-missing-end'
...
5d85fb4f
2015-06-23 09:08:18 -04:00
ec6d6be57d
Merge topic 'minor-cleanups'
...
820986edb3e2e33261c0113c080489b88bfaadfa217c243deb05dcd6cfae7fa4ccf7760f
2015-06-22 13:00:32 -04:00
24a0825585
Merge topic 'clean-up-ReadListFile'
...
81eb2c585c837686c10ab0143404f8a0a1858136ad47e6e5254be613826b6e68e53072d6b7166afa27f229b99166b49d384a0dba5e24ff17d5aaa2b9fff3c6cd
2015-06-22 13:00:30 -04:00
38ee28bfd5
Merge branch 'fix-function-missing-end' into release
2015-06-22 11:46:09 -04:00
5d85fb4f40
Fix assertion failure on unmatched function or macro
...
The fix in commit v3.2.3~3^2 (Fix assertion failure on unmatched foreach
in function, 2015-05-18) broke handling of unmatched non-loop blocks
because it assumed all function blockers removed during error unwinding
were for loops, essentially switching the set of mishandled cases.
The purpose of the loop block push/pop operations is to define a scope
matching the lifetime of the loop function blockers. Since our function
blockers already have the proper lifetime, simply move the push/pop
operations to their constructor/destructor.
Extend the RunCMake.Syntax test with a case covering this.
2015-06-22 11:41:51 -04:00
080489b8a9
cmMakefile: Use member directly instead of through method.
...
This function will not be around much longer anyway.
2015-06-21 21:14:06 +02:00
8bfaadfa39
cmMakefile: Move IsRoot API from cmLocalGenerator.
2015-06-21 21:14:05 +02:00
a863c59f70
cmMakefile: Use GetExecutionFileStack method.
2015-06-21 20:57:25 +02:00
076760a63c
cmMakefile: Add filename context to ExpandArguments.
...
The cmListFileArgument currently stores a FilePath for use in this
method. The filename is the same as the CMAKE_CURRENT_LIST_FILE,
except if executing a macro or function defined in another file.
Set the context filename when expanding the arguments of macros and
functions using the filename recorded when defining the prototype.
2015-06-21 20:57:25 +02:00
cfae7fa408
cmMakefile: Use cmOutputConverter instead of cmLocalGenerator.
2015-06-21 20:17:18 +02:00
81eb2c58a1
cmMakefile: Simplify filename handling.
...
This method has only one caller.
2015-06-21 20:10:52 +02:00
5c83768628
cmMakefile: Make the IncludeScope more responsible.
...
It is now responsible for all resource management when
including a file.
2015-06-21 20:10:52 +02:00
c10ab01434
cmMakefile: Move IncludeScope.
2015-06-21 20:10:52 +02:00
3404f8a081
cmMakefile: Move ListFile parsing responsibility out of internal method.
2015-06-21 20:10:51 +02:00
a1858136c2
cmMakefile: Rename parameter.
2015-06-21 20:10:51 +02:00
ad47e6e5bc
cmMakefile: Inline ReadListFileInternal into caller.
2015-06-21 20:10:50 +02:00
254be613b8
cmMakefile: Move resource management into the IncludeScope.
2015-06-21 20:10:50 +02:00
826b6e6818
cmMakefile: Move IncludeScope to ReadDependentFile.
...
Add replacement simple push/pop in the other two callers of
ReadListFile.
2015-06-21 20:10:50 +02:00
e53072d638
cmMakefile: Move IncludeScope instance.
2015-06-21 20:10:49 +02:00
b7166afa6d
cmMakefile: Remove File from IncludeScope.
...
Get it from the Makefile instead.
2015-06-21 20:10:49 +02:00
27f229b970
cmMakefile: Move include scope out of ReadListFileInternal.
...
Simplify the ReadListFileInternal API.
2015-06-21 20:10:48 +02:00
9166b49d70
cmMakefile: Change order of raii scopes.
2015-06-21 20:10:48 +02:00
384a0dba63
cmMakefile: Simplify condition handling.
2015-06-21 20:10:48 +02:00
5e24ff17a2
cmMakefile: Split file handling from execution.
2015-06-21 20:10:47 +02:00
d5aaa2b96f
cmMakefile: Move check for unused variables.
2015-06-21 20:10:47 +02:00
Brad King
Stephen Kelly
Ben Boeckel