05245b4229
cmMakefile: Move some preamble out of the Internal method.
2015-04-18 15:31:18 +02:00
6e23a4bddd
cmMakefile: Remove always-null first parameter to ReadListFile.
2015-04-18 15:31:18 +02:00
d21ebcb244
cmMakefile: Swap parameters of calls to ReadListFile.
...
The version with a null first parameter is now equivalent.
2015-04-18 15:31:18 +02:00
95a27267da
cmMakefile: Extract conditional code to caller.
2015-04-18 15:31:17 +02:00
7d24854736
cmMakefile: Remove intermediate variable.
2015-04-18 15:31:17 +02:00
9db1595410
cmMakefile: Move condition to the only calling context where it is true.
...
Call the Internal method with equivalent parameters, passing a null first
argument.
A duplicate path computation exists inside the external_in condition now,
but that is harmless at this point.
2015-04-18 15:31:11 +02:00
5d4480a8c7
cmMakefile: Populate CMAKE_PARENT_LIST_FILE in callers.
...
Because all external callers of this method pass a null first
parameter, this change has no effect for them.
This also makes it obvious that the CMAKE_PARENT_LIST_FILE is set to
the name of the file being read itself for CMakeLists.txt files,
which may not make any sense.
2015-04-18 15:29:20 +02:00
3a8ac2423e
cmMakefile: Collapse nested conditional.
2015-04-18 15:29:19 +02:00
5947d9b031
cmMakefile: Convert filenametoread into a std::string.
...
Remove other intermediate variables.
2015-04-18 15:29:19 +02:00
e2d0e0fbeb
cmMakefile: Remove intermediate variable.
2015-04-18 15:29:19 +02:00
3a1ad1713f
cmMakefile: Combine duplicate condition.
2015-04-18 15:29:19 +02:00
f0dae032ee
cmMakefile: Re-order independent statements.
2015-04-18 15:29:19 +02:00
08da874270
cmMakefile: Split a conditional.
2015-04-18 15:29:19 +02:00
3dc4fe02e6
cmMakefile: Re-order independent variable setting.
2015-04-18 15:29:19 +02:00
e4f8f1f1b7
cmMakefile: Remove intermediate variable.
2015-04-18 15:29:18 +02:00
2d6121a9a7
cmMakefile: Remove use of intermediate variable.
2015-04-18 15:29:18 +02:00
bdd4c5f5ba
cmMakefile: Move variable definition above a condition.
2015-04-18 15:29:18 +02:00
524ce89542
cmMakefile: Change condition to its equivalent.
...
This makes it easier to reason about follow-up commits.
2015-04-18 15:29:18 +02:00
813cd719c4
cmMakefile: Determine the file to read before calling Internal.
2015-04-18 15:29:18 +02:00
5c201f1ee6
cmMakefile: Remove duplication in ReadListFile.
2015-04-18 15:29:18 +02:00
0d9555779d
cmMakefile: Delegate ListFile reading to internal method.
2015-04-18 15:29:17 +02:00
846608f267
cmMakefile: Remove useless condition.
2015-04-18 15:29:17 +02:00
a2f2aeee2f
cmMakefile: Add wrapper for reading listfiles which have an origin.
...
Such files are delegates from other files, and so they set the
CMAKE_PARENT_LIST_FILE to the originator. They also may set a
policy scope.
2015-04-18 15:29:17 +02:00
68f791cd06
cmMakefile: Add a method for processing buildsystem files.
...
These are different from other ListFiles in that a project() command is
required if it is top-level.
2015-04-18 15:29:17 +02:00
5bb4248a80
cmMakefile: Remove fullPath parameter from ReadListFile.
...
There is no reason for this to be a responsibility of
ReadListFile. Additionally, the only user of it already computes
it itself.
2015-04-18 15:29:17 +02:00
5d056c0dd8
Port Global property interaction to cmState.
2015-04-15 11:43:50 -04:00
0076b5d834
cmake: Remove the happy global property scope pattern.
...
Global properties are already global in scope, so remove the
overload for specifying it and port users of the API.
The call from cmMakefile::GetProperty can be simplified because
the scope is only used during chaining, and there is no further
chaining after processing global properties.
2015-04-15 11:43:50 -04:00
0aec491328
Port cmCommand consumers to cmState.
2015-04-15 11:43:49 -04:00
b159bff732
Move property definition to cmState.
2015-04-13 20:13:13 +02:00
62c5e6f1a1
Merge topic 'introduce-cmState'
...
f081c5bdf71fdf0eff7169a0a6b1ad13
2015-04-13 11:45:02 -04:00
f081c5bddd
cmState: Move CacheEntryType enum from cmCacheManager.
2015-04-13 11:44:16 -04:00
f71fdf0ec8
cmMakefile: Remove unused CacheManager accessor.
...
Remove unneeded friend declarations from cmCacheManager.
2015-04-13 11:44:15 -04:00
ff7169a03c
Port to cmState.
2015-04-13 11:44:15 -04:00
a6b1ad1309
Introduce cmState class.
...
At this point, it is an interface to the cache. It will be extended
to be a universal interface for access to and manipulation of
configuration-time data (defintions, properties on targets,
directories, source files etc).
This will allow porting all command implementations away
from the cmMakefile and cmTarget classes, and result in something
more-purely related to configuration-time processing of cmake
commands. That should serve at least the following goals:
* Split the CMake implementation more definitively into three
stages: Configuration, computation and generation, and be able to
implement each optimally for memory access patterns etc.
* Make better IDE integration possible by making more configuration
data available.
* Make it possiblte to use a smaller library than CMakeLib.a in
cpack and ctest, resulting in smaller executables.
* Make it possible to run the configure step multiple times in
the same CMake run (#14539 ).
Manage its lifetime in the cmake class, and add a convenience accessor
to cmMakefile.
2015-04-13 11:44:14 -04:00
ea819b29f8
cmMakefile: Remove unused method.
2015-04-12 23:10:45 +02:00
6ad86c7fc4
cmMakefile: Remove bad comment.
2015-04-12 23:10:45 +02:00
fca2b542b4
cmMakefile: Internalize setting of CMakeInstance on Properties.
2015-04-12 23:10:45 +02:00
7bb4e3db06
cmMakefile: Out-of-line Home directory accessors.
2015-04-12 23:10:44 +02:00
ba404938a2
cmCacheManager: Port consumers to non-iterator API.
...
This simplifies reasoning about the follow-up commit which ports
away from cmCacheManager to a class with the same method names.
2015-04-08 18:47:00 +02:00
9e64156725
cmMakefile: Port away from CacheEntry.Initialized.
...
The API has no other external users.
2015-04-08 18:47:00 +02:00
77f2807ce5
cmCacheManager: Rename GetCacheValue to GetInitializedCacheValue.
...
Being initialized is a requirement for this method to return something,
and is what differentiates it from using GetIterator with it.GetValue.
2015-04-07 23:25:44 +02:00
1f2c12ebd1
cmMakefile: Remove cache version accessors.
...
They are only used by legacy code. Inline them there to simplify
cmMakefile.
2015-04-07 23:25:35 +02:00
97c50a8dbd
cmMakefile: Simplify GetDefinitions implementation.
2015-04-07 23:25:31 +02:00
3347c5e4f9
Revert topic 'refactor-cache-api'
...
This topic was never tested without some follow-up commits. The
GetCacheEntryValue API returns a pointer to memory freed on return.
It will have to be revised along with the rest of the original topic.
2015-04-07 17:15:04 -04:00
9410e24a4a
cmCacheManager: Port consumers to non-iterator API.
...
This simplifies reasoning about the follow-up commit which ports
away from cmCacheManager to a class with the same method names.
2015-04-06 17:58:55 +02:00
2e50f5e7d9
cmMakefile: Port away from CacheEntry.Initialized.
...
The API has no other external users.
2015-04-06 17:58:55 +02:00
9ada4c0433
cmCacheManager: Rename GetCacheValue to GetInitializedCacheValue.
...
Being initialized is a requirement for this method to return something,
and is what differentiates it from using GetIterator with it.GetValue.
2015-04-06 17:58:55 +02:00
08c642c6ae
cmMakefile: Remove cache version accessors.
...
They are only used by legacy code. Inline them there to simplify
cmMakefile.
2015-04-06 17:58:54 +02:00
cec8f97e57
cmMakefile: Simplify GetDefinitions implementation.
2015-04-06 17:58:54 +02:00
c37cf7fa9e
cmCacheManager: Remove unused method
2015-04-05 10:26:10 +02:00
Stephen Kelly
Brad King