summaryrefslogtreecommitdiffstats
path: root/Source/cmDefinitions.cxx
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'revert-definition-map-lookup' into releasev3.1.0-rc1Brad King2014-10-241-17/+5
|\
| * Revert "cmDefinitions: Don't store parent lookups"Ben Boeckel2014-10-241-17/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49. The behaviors associated with implicit pulldown on variable lookup seriously conflict with the optimizations made in these commits. Basically, since values were copied upon variable lookup, not just on PARENT_SCOPE, coupled with PARENT_SCOPE's behavior based on whether the variable is in the current scope or not causes serious problems with not storing a value for every variable at every scope. The commit changed behavior of the following example, among other cases: function(test_set) set(blah "value2") message("before PARENT_SCOPE blah=${blah}") set(blah ${blah} PARENT_SCOPE) message("after PARENT_SCOPE blah=${blah}") endfunction() set(blah value1) test_set() message("in parent scope, blah=${blah}") Reported-by: Alex Merry <alex.merry@kde.org> Reported-by: Ben Cooksley <bcooksley@kde.org>
* | cmDefinitions: Use a hashmap for faster checksBen Boeckel2014-06-091-2/+3
| | | | | | | | | | The hash map is much faster at checking that the map won't have what we're looking for so that we can just go to the parent scope instead.
* | cmDefinitions: Avoid a find-then-insert when setting variablesBen Boeckel2014-06-091-10/+1
|/ | | | Searching the map is not necessary.
* cmDefinitions: Don't store parent lookupsBen Boeckel2014-06-091-5/+17
| | | | | When looking up scopes, it is faster to not store the lookup locally to keep the maps smaller and avoid extra allocations and rebalancing.
* strings: Remove cmStdString referencesBen Boeckel2014-03-081-10/+10
| | | | | | | | | | | Casts from std::string -> cmStdString were high on the list of things taking up time. Avoid such implicit casts across function calls by just using std::string everywhere. The comment that the symbol name is too long is no longer relevant since modern debuggers alias the templates anyways and the size is a non-issue since the underlying methods are generated since it's inherited.
* stringapi: Use strings for variable namesBen Boeckel2014-03-081-4/+4
| | | | Variable names are always generated by CMake and should never be NULL.
* Only return local keys that are definedBen Boeckel2010-09-161-1/+4
|
* Add method to get the local scope variablesBen Boeckel2010-09-011-0/+13
|
* Convert CMake to OSI-approved BSD LicenseBrad King2009-09-281-14/+9
| | | | | | | This converts the CMake license to a pure 3-clause OSI-approved BSD License. We drop the previous license clause requiring modified versions to be plainly marked. We also update the CMake copyright to cover the full development time range.
* ENH: Improve dynamic variable scope implementationBrad King2009-07-221-0/+167
Previously each new variable scope (subdirectory or function call) in the CMake language created a complete copy of the key->value definition map. This avoids the copy using transitive lookups up the scope stack. Results of queries answered by parents are stored locally to maintain locality of reference. The class cmDefinitions replaces cmMakefile::DefinitionsMap, and is aware of its enclosing scope. Each scope stores only the definitions set (or unset!) inside it relative to the enclosing scope.