summaryrefslogtreecommitdiffstats
path: root/Source/cmState.cxx
Commit message (Collapse)AuthorAgeFilesLines
* cmState: Expose list of properties of values in the cacheTobias Hunger2016-06-101-0/+8
|
* Merge topic 'remove-needless-copies'Brad King2016-05-271-2/+2
|\ | | | | | | | | | | 27ead963 Remove unnecessary local copies. 618fb23f Pass arguments that are not modified as const&.
| * Pass arguments that are not modified as const&.Daniel Pfeifer2016-05-261-2/+2
| | | | | | | | | | | | | | Use clang-tidy's performance-unnecessary-value-param checker to find value parameter declarations of expensive to copy types that are not modified inside the function. Ignore findings in kwsys. After applying the fix-its, manually change `const T&` to `T const&`.
* | Remove redundant c_str() calls.Daniel Pfeifer2016-05-261-4/+4
|/ | | | | Run clang-tidy's readability-redundant-string-cstr checker. Ignore findings in kwsys.
* Revise C++ coding style using clang-formatKitware Robot2016-05-161-685/+520
| | | | | | | | | | | | | Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
* Format include directive blocks and ordering with clang-formatBrad King2016-04-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort include directives within each block (separated by a blank line) in lexicographic order (except to prioritize `sys/types.h` first). First run `clang-format` with the config file: --- SortIncludes: false ... Commit the result temporarily. Then run `clang-format` again with: --- SortIncludes: true IncludeCategories: - Regex: 'sys/types.h' Priority: -1 ... Commit the result temporarily. Start a new branch and cherry-pick the second commit. Manually resolve conflicts to preserve indentation of re-ordered includes. This cleans up the include ordering without changing any other style. Use the following command to run `clang-format`: $ git ls-files -z -- \ '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | egrep -z -v '(Lexer|Parser|ParserHelper)\.' | egrep -z -v '^Source/cm_sha2' | egrep -z -v '^Source/(kwsys|CursesDialog/form)/' | egrep -z -v '^Utilities/(KW|cm).*/' | egrep -z -v '^Tests/Module/GenerateExportHeader' | egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | xargs -0 clang-format -i This selects source files that do not come from a third-party. Inspired-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
* Merge topic 'refactor-cmListFileBacktrace'Brad King2016-04-181-43/+17
|\ | | | | | | | | | | | | | | | | 0f96ef00 Remove unused cmake::IssueMessage overload 563bf9dd cmState: Remove unused entry point fields from snapshot data 7c36d206 cmListFileBacktrace: Refactor storage to provide efficient value semantics 1f6bd8a9 cmState: Avoid accumulating snapshot storage for backtraces 18b6676b cmState: Add Snapshot method to get bottom of call stack
| * cmState: Remove unused entry point fields from snapshot dataBrad King2016-04-181-12/+0
| | | | | | | | This information is now kept in cmMakefile::Backtrace.
| * cmListFileBacktrace: Refactor storage to provide efficient value semanticsBrad King2016-04-181-26/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.4.0-rc1~321^2~2 (Genex: Store a backtrace, not a pointer to one, 2015-07-08) we treat cmListFileBacktrace instances as lightweight values. This was true at the time only because the backtrace information was kept in the cmState snapshot hierarchy. However, that forced us to accumulate a lot of otherwise short-lived snapshots just to have the backtrace fields available for reference by cmListFileBacktrace instances. Recent refactoring made backtrace instances independent of the snapshot hierarchy to avoid accumulating short-lived snapshots. This came at the cost of making backtrace values heavy again, leading to lots of string coying and slower execution. Fix this by refactoring cmListFileBacktrace to provide value semantics with efficient shared storage underneath. Teach cmMakefile to maintain its call stack using an instance of cmListFileBacktrace. This approach allows the current backtrace to be efficiently saved whenever it is needed. Also teach cmListFileBacktrace the notion of a file-level scope. This is useful for messages about the whole file (e.g. during parsing) that are not specific to any line within it. Push the CMakeLists.txt scope for each directory and never pop it. This ensures that we always have some context information and simplifies cmMakefile::IssueMessage. Push/pop a file-level scope as each included file is processed. This supersedes cmParseFileScope and improves diagnostic message context information in a few places. Fix the corresponding test cases to expect the improved output.
| * cmState: Avoid accumulating snapshot storage for backtracesBrad King2016-04-151-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes during post-3.3/pre-3.4 development refactored storage of most configure-time information, including variable bindings and function scopes. All scopes (even short-lived) were kept persistently for possible future debugging features, causing huge accumulated memory usage. This was mostly addressed by commit v3.4.1~4^2 (cmState: Avoid accumulating snapshot storage for short-lived scopes, 2015-11-24). Since then we still keep short-lived scopes when they are needed for a backtrace. This is because since commit v3.4.0-rc1~378^2 (cmListFileBacktrace: Implement in terms of cmState::Snapshot, 2015-05-29) backtraces have been lightweight objects that simply point into the snapshot tree. While the intention of this approach was to avoid duplicating the call stack file path strings, the cost turned out to be holding on to the entire call stack worth of scope snapshots, which is much worse. Furthermore, since commit v3.4.0-rc2~1^2 (cmIfCommand: Issue CMP0054 warning with appropriate context, 2015-10-20) all conditions used in `if()` commands hold a backtrace for use in diagnostic messages. Even though the backtrace is short-lived it still causes the scope snapshot to be kept. This means that code like function(foo) if(0) endif() endfunction() foreach(i RANGE 1000000) foo() endforeach() accumulates storage for the function call scope snapshots. Fix this by partially reverting commit v3.4.0-rc1~378^2 and saving the entire call stack during cmListFileBacktrace construction. This way we can avoid keeping short-lived scope snapshot storage in all cases.
| * cmState: Add Snapshot method to get bottom of call stackBrad King2016-04-151-0/+15
| | | | | | | | | | The bottom of the call stack is always a long-lived snapshot and can be saved for later use with cmOutputConverter.
* | Solaris: Add a CMAKE_HOST_SOLARIS variable (#16061)Stafen Teleman2016-04-151-0/+3
|/
* cmState: Rename CallStack snapshots to IncludeFileBrad King2016-04-121-5/+5
|
* Merge branch 'reduce-cmState-accumulation' into ↵Brad King2015-11-251-30/+60
|\ | | | | | | reduce-cmState-accumulation-for-master
| * cmState: Avoid accumulating snapshot storage for short-lived scopesBrad King2015-11-251-0/+29
| | | | | | | | | | We need to keep only certain snapshot types and their ancestors. Also keep those needed for backtraces.
| * cmState: Avoid accumulating policy stack storage for short-lived scopesBrad King2015-11-251-1/+1
| | | | | | | | | | | | | | We enforce policy push/pop balance around any scope that pushes/pops a snapshot. Therefore a snapshot may never reference entries of PolicyStack that were created in nested scopes. Free storage of short-lived policy stack entries when they are popped.
| * cmLinkedTree: Rename 'Extend' method to 'Push'Brad King2015-11-251-29/+29
| | | | | | | | | | | | Logically the method pushes a nested scope on top of a given scope because the "up" pointer sequence forms a stack independent of any other branches of the tree.
| * cmState: Enforce policy scope balancing around variable scopesBrad King2015-11-251-0/+1
| | | | | | | | | | | | | | | | Everywhere we use cmMakefile::ScopePushPop to manage variable scopes also expects policy scopes to be balanced. There is no place that we use cmMakefile::PolicyPushPop without also using ScopePushPop. Relieve PolicyPushPop of responsibility for policy scope balance checks by moving it to ScopePushPop.
* | Merge topic 'fix-find_package-version-file-error-stack'Brad King2015-11-251-2/+4
|\ \ | |/ | | | | | | | | | | 62126b67 Merge branch 'test-cmake_policy-unmatched' into fix-find_package-version-file-error-stack 2e28c619 cmState: Skip variable scope snapshots to avoid call stack duplicates b219ff94 Tests: Add case for package version file unmatched policy scope
| * cmState: Skip variable scope snapshots to avoid call stack duplicatesBrad King2015-11-241-2/+4
| | | | | | | | | | | | | | | | | | Since commit v3.4.0-rc1~179^2~1 (cmState: Add a VariableScope snapshot type, 2015-08-23) the snapshot stack may have a VariableScopeType entry. Skip over these when constructing the call stack, just as we do for policy scopes. Otherwise we report the command causing the variable scope to be entered twice (e.g. find_package while loading a package version file).
* | cmState: Move GetTargetTypeName from cmTarget.Stephen Kelly2015-10-141-0/+27
| |
* | Subdirs: Initialize from parent before configuring.Stephen Kelly2015-10-131-0/+14
| | | | | | | | | | | | | | Add new API for the subdirs command to cmState. This fixes a regression introduced in commit f716460e (cmMakefile: Move invokation to initialize snapshot., 2015-10-06).
* | cmState: Initialize properties immediately.Stephen Kelly2015-10-131-0/+4
| | | | | | | | Don't leave this as cmMakefile responsibility.
* | cmState: Initialize default definitions immediately.Stephen Kelly2015-10-131-0/+50
| | | | | | | | Don't leave this as cmMakefile responsibility.
* | cmState: Initialize current directories immediately.Stephen Kelly2015-10-131-0/+8
| | | | | | | | Don't leave this as cmMakefile responsibility.
* | cmState: Initialize top level source directories immediately.Stephen Kelly2015-10-131-0/+19
| | | | | | | | Don't leave this as cmMakefile responsibility.
* | cmState: Port away from cmake instance.Stephen Kelly2015-10-101-23/+24
| |
* | cmState: Move ParseCacheEntry from cmCacheManager.Stephen Kelly2015-10-101-0/+84
| |
* | cmState: Add API for cache version.Stephen Kelly2015-10-101-0/+10
| |
* | cmState: Externalize logic to caller.Stephen Kelly2015-10-101-1/+0
| |
* | cmCacheManager: Port away from cmake instance.Stephen Kelly2015-10-101-0/+1
| |
* | cmState: Add cache file manipulation wrappers.Stephen Kelly2015-10-101-0/+18
| |
* | cmState: Internalize the initialization of a snapshot from its parent.Stephen Kelly2015-10-071-0/+2
|/
* Merge topic 'fix-buildsystem-property-append'Brad King2015-09-141-2/+7
|\ | | | | | | | | | | | | | | ed258d60 Tests: Cover set_property for buildsystem directory properties fb45c371 cmState: Only append non-empty values to buildsystem properties. 158f7e31 cmMakefile: Use appropriate parameter name. 08ce3f48 cmTarget: Only append non-empty values to buildsystem properties.
| * cmState: Only append non-empty values to buildsystem properties.Stephen Kelly2015-09-111-0/+5
| | | | | | | | | | | | This is a change in behavior from CMake 3.3, but there is no semantic meaning to empty entries in buildsystem properties. This also restores behavior to that of CMake 2.8.10.
| * cmMakefile: Use appropriate parameter name.Stephen Kelly2015-09-111-2/+2
| |
* | cmState: Return end snapshot for GetBuildsystemDirectoryParent.Stephen Kelly2015-09-111-1/+2
|/ | | | | | | This is the appropriate snapshot for future use. Existing users of this method are mostly just calling GetDirectory on the result, but the progress tracking of the Makefile generator needs a consistent snapshot to be used, so the end snapshot should be consistently used.
* Merge topic 'cmState-ProjectName'Brad King2015-08-271-0/+12
|\ | | | | | | | | | | | | | | 637c56b4 cmGlobalGenerator: Implement FillProjectMap in terms of cmState. b3f2299e cmState: Move ProjectName from cmMakefile. 6ce940ac cmMakefile: Use std::string in ProjectName API. e8c0341d cmMakefile: Out-of-line GetProjectName.
| * cmState: Move ProjectName from cmMakefile.Stephen Kelly2015-08-251-0/+12
| |
* | Merge topic 'rm-cmLocalGenerator-Children'Brad King2015-08-271-1/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 867b5be8 cmLocalGenerator: Remove unused Children member. 6c832219 cmLocalGenerator: Implement child traversal in terms of cmState. 3fcf3837 Makefiles: Remove valueless cast. 223f4a66 cmLocalGenerator: Simplify condition. ae026f54 cmState: Store Children states in parent state.
| * | cmState: Store Children states in parent state.Stephen Kelly2015-08-241-1/+11
| |/
* | cmState: Make Snapshot EqualityComparable.Stephen Kelly2015-08-241-0/+10
|/
* cmState: Move directory Properties from cmMakefile.Stephen Kelly2015-08-241-0/+163
|
* Merge topic 'cmState-definitions'Brad King2015-08-241-2/+124
|\ | | | | | | | | | | | | | | | | | | bff27391 cmState: Host variable definitions. 6954c893 cmState: Add a VariableScope snapshot type. 1fc645bd cmState: Add a Base snapshot type. 0f070dd3 cmMakefile: Decouple the container of cmDefinitions from scoping logic. 25e04ddf cmDefinitions: Implement in terms of cmLinkedTree. 4bbe261c cmMakefile: Extract InitializeVarScope method.
| * cmState: Host variable definitions.Stephen Kelly2015-08-231-0/+102
| |
| * cmState: Add a VariableScope snapshot type.Stephen Kelly2015-08-231-0/+19
| | | | | | | | Match the scopes currently used in cmMakefile for definitions.
| * cmState: Add a Base snapshot type.Stephen Kelly2015-08-231-2/+3
| | | | | | | | For completeness mostly.
* | Merge topic 'refactor-progress'Brad King2015-08-241-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fa1b964 cmGlobalUnixMakefileGenerator3: Change the progress container key. 55e39276 cmState: Make it possible to order cmState::Snapshot. 04168cbb cmGlobalUnixMakefileGenerator3: Rename member. 2394584c cmGlobalGenerator: Rename progress initializer method. b9eb3cd1 cmGlobalGenerator: Move LG to target map to subclass. f5d2b7a6 cmGlobalGenerator: Remove clearance of map.
| * | cmState: Make it possible to order cmState::Snapshot.Stephen Kelly2015-08-231-0/+6
| |/
* | include_directories: Fix regression in BEFORE option (#15693)Brad King2015-08-211-6/+5
|/ | | | | | Refactoring in commit 6ed9c7e0 (cmState: Host buildsystem properties for directories, 2015-07-18) broke include_directories(BEFORE). Fix it and add a test case.