summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'hp-gnu-asm'Brad King2015-05-051-0/+2
|\ | | | | | | | | f4734270 HP-UX: Add GNU compiler information for ASM language
| * HP-UX: Add GNU compiler information for ASM languageBrad King2015-05-041-0/+2
| | | | | | | | Suggested-by: Gerhard Grimm <gerhard.grimm@detec.com>
* | Merge topic 'InstallRequiredSystemLibraries-vs2015'Brad King2015-05-051-2/+10
|\ \ | | | | | | | | | | | | 9b2778d4 InstallRequiredSystemLibraries: Update for VS 2015 (#15552)
| * | InstallRequiredSystemLibraries: Update for VS 2015 (#15552)Brad King2015-05-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | The part of the MS C Runtime library that applications need to distribute has been renamed from "msvcr*.dll" to "vcruntime*.dll" starting with VS 2015. See the Visual C++ Team Blog: Introducing the Universal CRT http://blogs.msdn.com/b/vcblog/archive/2015/03/03/introducing-the-universal-crt.aspx
* | | Merge topic 'refactor-cmMakefile-constructor'Brad King2015-05-052-9/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | 42142d4f cmMakefile: Inline Intialize method in constructor f39f0c0a cmMakefile: Initialize SuppressWatches member before use
| * | | cmMakefile: Inline Intialize method in constructorBrad King2015-05-042-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | Since commit 80909041 (cmMakefile: Disable copy constructor, 2015-04-18) the only call to cmMakefile::Initialize is in one constructor. Inline it and drop the separate method.
| * | | cmMakefile: Initialize SuppressWatches member before useBrad King2015-05-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 86f3cd0f (cmMakefile: Require the localGenerator in the constructor, 2015-04-27) we added use of GetDefinition to the Initialize method. Set SuppressWatches before calling this method since GetDefinition checks it.
* | | | Merge topic 'FindGTest-fix-test-space-parsing'Brad King2015-05-051-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0f927b44 FindGTest: Fix parsing of test macro calls with spaces (#15553)
| * | | | FindGTest: Fix parsing of test macro calls with spaces (#15553)Brad King2015-05-041-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | Tolerate spaces before the open paren and after the test name before the comma.
* | | | CMake Nightly Date StampKitware Robot2015-05-051-1/+1
|/ / /
* | | Merge topic 'truncate-snapshots'Brad King2015-05-041-2/+5
|\ \ \ | | | | | | | | | | | | | | | | 83dc483e cmState: Truncate snapshot data in Initialize.
| * | | cmState: Truncate snapshot data in Initialize.Stephen Kelly2015-05-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Configure is executed multiple times with the same cmake instance (either using CTest --two-config or a interactive gui), the location and structural data was preserved though it would not be used again. Fix that by clearing the data in a method called early in the configure step.
* | | | Merge topic 'add-cmMakefile-GetGlobalGenerator'Brad King2015-05-0429-139/+97
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0836ed9 Port to cmMakefile::GetGlobalGenerator. cbf143bb cmComputeTargetDepends: Use simpler global generator access. 040491fc cmComputeLinkDepends: Remove unused local generator. 0bb6dbe0 cmMakefile: Extract an accessor for the global generator. e1bdf5f5 cmMakefile: Use GetCMakeInstance. efcca935 cmMakefile: Simplify GetCMakeInstance implementation.
| * | | | 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.
* | | | Merge topic 'refactor-cmDefinitions-Get'Brad King2015-05-043-38/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c7dad41 cmDefinitions: Make Get method static. a7ce0c7b cmDefinitions: Make GetInternal method static. 7a5039fa cmDefinitions: Use static member without this->. 191573f7 cmDefinitions: Remove Parent pointer. 8b1745a1 cmDefinitions: Accept varStack iterators in Get API.
| * | | | 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
| | | | |
* | | | | Merge topic 'mingw32-make-backslash-workaround'Brad King2015-05-042-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bb6663ca Makefile: Workaround mingw32-make trailing backslash trouble (#15546)
| * | | | | Makefile: Workaround mingw32-make trailing backslash trouble (#15546)Brad King2015-05-012-0/+11
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When given the command line tool a\ b c mingw32-make incorrectly passes "a b" and "c" to the tool. When given the command line tool a\ b "c" mingw32-make correctly passes "a\", "b", and "c" to the tool. Since commit v3.1.0-rc1~861^2 (MSVC: Add properties to configure compiler PDB files, 2014-02-24) we pass the compiler pdb option to MS-style compiler tools as "/Fd<dir>\" but mingw32-make may consume the backslash as escaping a following space as described above. Workaround this problem by changing the backslash to a forward slash as had been used prior to the above commit.
* | | | | CMake Nightly Date StampKitware Robot2015-05-041-1/+1
| |_|/ / |/| | |
* | | | 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
| | | | | | |
generated by cgit v0.12 at 2025-09-11 17:23:06 (GMT)