summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmDefinitions: Make Get method static.Stephen Kelly2015-05-012-5/+5
|
* cmDefinitions: Make GetInternal method static.Stephen Kelly2015-05-012-14/+12
| | | | | | | | For some reason, using recursion here is faster to configure ParaView than using a loop. Probably some compiler optimization is inhibited by using a loop. Co-Author: Brad King <brad.king@kitware.com>
* cmDefinitions: Use static member without this->.Stephen Kelly2015-05-011-1/+1
|
* cmDefinitions: Remove Parent pointer.Stephen Kelly2015-05-013-21/+1
| | | | All structural knowledge of the stack of scopes is now external.
* cmDefinitions: Accept varStack iterators in Get API.Stephen Kelly2015-05-013-10/+22
|
* cmMakefile: Implement RaiseScope without relying on Parent.Stephen Kelly2015-04-301-20/+24
|
* cmMakefile: Implement RaiseScope in terms of local Get method.Stephen Kelly2015-04-301-1/+1
| | | | The cmDefinitions::Get will change behavior in follow up commits.
* Merge topic 'refactor-cmDefinitions'Brad King2015-04-303-134/+179
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b48ea26a cmDefinitions: Invert conditional code. 5ccff640 cmDefinitions: Externalize looping for ClosureKeys. f79cd99d cmDefinitions: Implement MakeClosure in terms of reverse iterators. aa4d1ee8 cmDefinitions: Convert MakeClosure into a static method. 60becdc6 cmDefinitions: Implement MakeClosure in terms of a list of ancestors. d858f363 cmDefinitions: Use list of cmDefinitions* to create closure. aaaa65b6 cmMakefile: Remove stack adaptor for the VarStack. f983d891 cmDefinitions: Replace recursion with loop. 24885d4e cmDefinitions: Replace private constructor with MakeClosure. 012a75a0 cmDefinitions: Make ClosureKeys API vector-based. ca9fa77d cmDefinitions: Inline GetClosureKeys implementation. 78e1454e cmDefinitions: Replace ClosureKeys recursion with looping. 818bf727 cmDefinitions: Change LocalKeys to return a vector. 5067ae41 cmDefinitions: Externalize the Set logic. 60200ca5 cmDefinitions: Add an Erase method. b43c162e cmMakefile: Use the Internal class to enclose the VarStack.
| * cmDefinitions: Invert conditional code.Stephen Kelly2015-04-291-5/+6
| | | | | | | | Return the simple case first.
| * cmDefinitions: Externalize looping for ClosureKeys.Stephen Kelly2015-04-293-18/+20
| |
| * cmDefinitions: Implement MakeClosure in terms of reverse iterators.Stephen Kelly2015-04-293-22/+16
| | | | | | | | Iterate directly over the parent content provided by cmMakefile.
| * cmDefinitions: Convert MakeClosure into a static method.Stephen Kelly2015-04-293-11/+16
| | | | | | | | Accept a range of cmDefinitions*.
| * cmDefinitions: Implement MakeClosure in terms of a list of ancestors.Stephen Kelly2015-04-292-13/+17
| |
| * cmDefinitions: Use list of cmDefinitions* to create closure.Stephen Kelly2015-04-291-3/+11
| |
| * cmMakefile: Remove stack adaptor for the VarStack.Stephen Kelly2015-04-291-12/+12
| | | | | | | | | | | | | | | | | | The purpose of the stack is to allow access only to the top of it. Access to items which are not at the top is needed, so cmDefinitions objects get a Parent pointer. The existence of the Parent pointer is a workaround for the inappropriate use of stack in the first place. Remove it now.
| * cmDefinitions: Replace recursion with loop.Stephen Kelly2015-04-291-18/+16
| |
| * cmDefinitions: Replace private constructor with MakeClosure.Stephen Kelly2015-04-293-20/+10
| |
| * cmDefinitions: Make ClosureKeys API vector-based.Stephen Kelly2015-04-293-11/+8
| | | | | | | | | | | | | | Construct the final list directly in a named return value. Use a single set to track bindings already found. Co-Author: Brad King <brad.king@kitware.com>
| * cmDefinitions: Inline GetClosureKeys implementation.Stephen Kelly2015-04-292-11/+1
| |
| * cmDefinitions: Replace ClosureKeys recursion with looping.Stephen Kelly2015-04-291-14/+14
| |
| * cmDefinitions: Change LocalKeys to return a vector.Stephen Kelly2015-04-293-9/+10
| | | | | | | | This is more efficient and we lose nothing.
| * cmDefinitions: Externalize the Set logic.Stephen Kelly2015-04-292-11/+10
| |
| * cmDefinitions: Add an Erase method.Stephen Kelly2015-04-292-0/+7
| |
| * cmMakefile: Use the Internal class to enclose the VarStack.Stephen Kelly2015-04-291-46/+95
| | | | | | | | Put knowledge of the implementation details in one place.
* | Merge topic 'test-RunCMake-parallel-make'Brad King2015-04-301-0/+3
|\ \ | | | | | | | | | | | | 703e7625 Tests: Protect RunCMake tests from MAKEFLAGS in environment (#15542)
| * | Tests: Protect RunCMake tests from MAKEFLAGS in environment (#15542)Brad King2015-04-291-0/+3
| |/
* | Merge topic 'FindwxWidgets-versioned-executable'Brad King2015-04-301-1/+1
|\ \ | | | | | | | | | | | | 1b04561e FindwxWidgets: Search for wx-config-3.0 in addition to wx-config (#15540)
| * | FindwxWidgets: Search for wx-config-3.0 in addition to wx-config (#15540)Orion Poplawski2015-04-291-1/+1
| |/ | | | | | | | | The Fedora package installs 'wx-config' as 'wx-config-3.0' so look for the latter name too.
* | Merge topic 'cpack-deb-component-description'Brad King2015-04-306-9/+254
|\ \ | | | | | | | | | | | | 2f0afffa CPackDEB component description
| * | CPackDEB component descriptionRaffi Enficiaud2015-04-296-9/+254
| | | | | | | | | | | | | | | Support for setting different description for each component.
* | | Merge topic 'if-IN_LIST'Brad King2015-04-3017-2/+144
|\ \ \ | | | | | | | | | | | | | | | | aed6239e if: Implement new IN_LIST operator
| * | | if: Implement new IN_LIST operatorNils Gladitz2015-04-3017-2/+144
| | | |
* | | | Merge topic 'revert-CMP0057'Brad King2015-04-3017-129/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | 32a2f414 Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."
| * | | Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."Nils Gladitz2015-04-3017-129/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 242c3966 (add_custom_command: Diagnose MAIN_DEPENDENCY limitation, 2015-03-09) and the follow up commit b372a99a (UseSWIG: Do not use MAIN_DEPENDENCY on custom commands, 2015-03-26). I misdiagnosed the underlying issue that prompted creation of policy CMP0057. The actual issue surfaces when a single custom command's MAIN_DEPENDENCY is listed in more than one target; this issue will have to be addressed independently.
* | | Merge topic 'doc-CMP0054-example'Brad King2015-04-301-6/+10
|\ \ \ | | | | | | | | | | | | | | | | 9535b86d Help: Replace CMP0054 example to show when it makes a difference
| * | | Help: Replace CMP0054 example to show when it makes a differenceTamás Kenéz2015-04-291-6/+10
| | |/ | |/| | | | | | | | | | | | | The previous example for CMP0054 did not show how critical the policy is since the result is the same in both cases (NEW and OLD behavior). Instead show an example when the policy does make a difference.
* | | Merge topic 'doc-CPack-typo'Brad King2015-04-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 4e70fa5c CPack: Fix typo in CPACK_INSTALL_CMAKE_PROJECTS docs (#15543)
| * | | CPack: Fix typo in CPACK_INSTALL_CMAKE_PROJECTS docs (#15543)Felix Geyer2015-04-291-1/+1
| |/ /
* | | Merge topic 'doc-target-file-types'Brad King2015-04-3023-49/+161
|\ \ \ | | | | | | | | | | | | | | | | d401aa21 Help: Revise buildsystem artifact file type documentation (#15539)
| * | | Help: Revise buildsystem artifact file type documentation (#15539)Brad King2015-04-2923-49/+161
| | | | | | | | | | | | | | | | | | | | | | | | Add sections to the cmake-buildsystem(7) manual and cross-reference them with relevant variables and target properties. This avoids duplicating the information and allows it to be more detailed.
* | | | Merge topic 'doc-cmake_minimum_required-first'Brad King2015-04-302-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6ac3712d Help: Document that cmake_minimum_required should be called first
| * | | | Help: Document that cmake_minimum_required should be called firstBrad King2015-04-292-0/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many projects put their project() call first, but the actions taken by this command can be influenced by policies and other information set by a call to cmake_minimum_required. Document in each of these two commands that cmake_minimum_required should be called first. Suggested-by: Alan W. Irwin
* | | | CMake Nightly Date StampKitware Robot2015-04-301-1/+1
| |/ / |/| |
* | | Merge topic 'clean-up-cmDefinitions'Brad King2015-04-292-30/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a3358fac cmDefinitions: Inline SetInternal method. 23370344 cmDefinitions: Remove unused Set return value. b9f4dd39 cmDefinitions: Remove unused method.
| * | | cmDefinitions: Inline SetInternal method.Stephen Kelly2015-04-282-16/+9
| | | |
| * | | cmDefinitions: Remove unused Set return value.Stephen Kelly2015-04-282-6/+4
| | | |
| * | | cmDefinitions: Remove unused method.Stephen Kelly2015-04-282-10/+0
| |/ /
* | | Merge topic 'CMP0026-doc-title'Brad King2015-04-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 853ef717 Help: Clarify policy CMP0026 title
| * | | Help: Clarify policy CMP0026 titleNils Gladitz2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that the policy only applies to build targets and not e.g. imported targets. Suggested-by: Alan W. Irwin
* | | | Merge topic 'cmState-CurrentDirs'Brad King2015-04-2965-195/+313
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46f6a5f4 cmState: Store the Current directories. 3a041c59 Introduce cmState::Snapshot. ae6c8a9d cmState: Store the Source and Binary directories. 86f3cd0f cmMakefile: Require the localGenerator in the constructor. a48aebcb cmLocalGenerator: Require a parent in the constructor. e4c78b37 cmMakefile: Inline SetHome* methods into last remaining caller. 410f39a4 cmMakefile: Delegate storage of Home dirs to the cmake class.