summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Port to cmMakefile::GetGlobalGenerator.Stephen Kelly2015-05-0325-122/+86
|
* cmComputeTargetDepends: Use simpler global generator access.Stephen Kelly2015-05-031-3/+1
|
* cmComputeLinkDepends: Remove unused local generator.Stephen Kelly2015-05-032-5/+1
|
* cmMakefile: Extract an accessor for the global generator.Stephen Kelly2015-05-032-1/+7
| | | | | | Both for convenience, and because cmMakefile should not be the way to get access to the local generator, so that should go away in the future.
* cmMakefile: Use GetCMakeInstance.Stephen Kelly2015-05-031-4/+2
|
* cmMakefile: Simplify GetCMakeInstance implementation.Stephen Kelly2015-05-031-5/+1
| | | | | No callers handle the possibility that it can return null, and that is no longer possible anyway.
* CMake Nightly Date StampKitware Robot2015-05-031-1/+1
|
* CMake Nightly Date StampKitware Robot2015-05-021-1/+1
|
* Merge topic 'refactor-RaiseScope'Brad King2015-05-011-20/+24
|\ | | | | | | | | | | e8ae46e5 cmMakefile: Implement RaiseScope without relying on Parent. 30a021cc cmMakefile: Implement RaiseScope in terms of local Get method.
| * 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 'sphinx-options'Brad King2015-05-012-3/+15
|\ \ | | | | | | | | | | | | | | | dd107b30 Add option to pass custom flags to sphinx-build (#15545) 6064b907 bootstrap: Fix SPHINX_{MAN,HTML,QTHELP} cache entry type
| * | Add option to pass custom flags to sphinx-build (#15545)Brad King2015-04-302-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Create a SPHINX_FLAGS cache entry that users can populate with command-line flags for sphinx-build. Add an option to the bootstrap script to populate it up front. Suggested-by: Felix Geyer <debfx@ubuntu.com>
| * | bootstrap: Fix SPHINX_{MAN,HTML,QTHELP} cache entry typeBrad King2015-04-301-3/+3
| | | | | | | | | | | | These cache entries should be generated with type BOOL, not FILEPATH.
* | | Merge topic 'fix-cmState-try_compile-languages'Brad King2015-05-014-2/+9
|\ \ \ | | | | | | | | | | | | | | | | 27343e3b cmGlobalGenerator: Finish storing enabled languages in cmState
| * | | cmGlobalGenerator: Finish storing enabled languages in cmStateBrad King2015-04-304-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 74de9a73 (cmGlobalGenerator: Delegate storage of enabled languages to cmState, 2015-04-11) the original LanguageEnabled member of cmGlobalGenerator was left behind by mistake. One use of it in EnableLanguagesFromGenerator (for try_compile) was left, but the member is not populated anymore. Drop the member and teach EnableLanguagesFromGenerator to copy the list of enabled languages from one cmState to the other. Reported-by: Matt McCormick <matt.mccormick@kitware.com>
* | | | Merge topic 'cmComputeLinkInformation-minor-cleanup'Brad King2015-05-011-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | faede40b cmComputeLinkInformation: Reduce 'if' nesting in AddItem
| * | | | cmComputeLinkInformation: Reduce 'if' nesting in AddItemBrad King2015-04-211-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Also add a comment explaining why interface libraries still get a link item.
* | | | | CMake Nightly Date StampKitware Robot2015-05-011-1/+1
| |_|_|/ |/| | |
* | | | 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
| |/ / / /