summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2015-06-081-1/+1
|
* CMake Nightly Date StampKitware Robot2015-06-071-1/+1
|
* CMake Nightly Date StampKitware Robot2015-06-061-1/+1
|
* Merge topic 'update-kwsys'Brad King2015-06-055-0/+125
|\ | | | | | | | | | | bccbe281 Merge branch 'upstream-kwsys' into update-kwsys 6cafd8ed KWSys 2015-06-03 (8533a79b)
| * Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-06-045-0/+125
| |\
| | * KWSys 2015-06-03 (8533a79b)KWSys Robot2015-06-045-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 8533a79b | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 61e0419f..8533a79b Zack Galbreath (1): 8533a79b SystemInformation: Add GetLoadAverage() method
* | | CMake Nightly Date StampKitware Robot2015-06-051-1/+1
| | |
* | | Merge branch 'release'Brad King2015-06-040-0/+0
|\ \ \ | |/ / |/| |
| * | Merge branch 'CPackDeb-dpkg-shlibdeps-check-flag' into releasev3.3.0-rc1Brad King2015-06-031-7/+11
| |\ \
* | \ \ Merge topic 'cmMakefile-Configure'Brad King2015-06-0413-153/+115
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7657e8b1 cmMakefile: Introduce a local cmMakefile variable. 4e8f242d cmMakefile: Store unconfigured cmMakefiles. d65e0123 cmMakefile: Implement ConfigureSubDirectory in terms of cmMakefile. f059ed16 cmMakefile: Move Configure responsibility from cmLocalGenerator. a653611d cmake: Replace CurrentLocalGenerator concept with CurrentMakefile. 69a038a9 cmMakefile: Refactor directories specified with the subdirs command. 08637970 cmLocalGenerator: ComputeObjectMaxPath just before generating. 27e11c6f Merge Configure state with GeneratingBuildSystem state. 363caa2f cmLocalGenerator: De-virtualize Configure().
| * | | | cmMakefile: Introduce a local cmMakefile variable.Stephen Kelly2015-06-041-5/+7
| | | | |
| * | | | cmMakefile: Store unconfigured cmMakefiles.Stephen Kelly2015-06-042-5/+5
| | | | | | | | | | | | | | | | | | | | Not cmLocalGenerators.
| * | | | cmMakefile: Implement ConfigureSubDirectory in terms of cmMakefile.Stephen Kelly2015-06-042-8/+8
| | | | |
| * | | | cmMakefile: Move Configure responsibility from cmLocalGenerator.Stephen Kelly2015-06-045-83/+62
| | | | | | | | | | | | | | | | | | | | The generator should only have a function at generate time.
| * | | | cmake: Replace CurrentLocalGenerator concept with CurrentMakefile.Stephen Kelly2015-06-045-23/+21
| | | | |
| * | | | cmMakefile: Refactor directories specified with the subdirs command.Stephen Kelly2015-06-043-7/+24
| | | | | | | | | | | | | | | | | | | | Store the directories on the cmMakefile as explicitly not-configured-yet.
| * | | | cmLocalGenerator: ComputeObjectMaxPath just before generating.Stephen Kelly2015-06-043-3/+2
| | | | |
| * | | | Merge Configure state with GeneratingBuildSystem state.Stephen Kelly2015-06-046-24/+14
| | | | |
| * | | | cmLocalGenerator: De-virtualize Configure().Stephen Kelly2015-06-045-34/+11
| | | | | | | | | | | | | | | | | | | | | | | | | The generators that override it do so in order to populate data members which can instead be populated in Generate().
* | | | | Merge topic 'remove-CMAKE_USE_RELATIVE_PATHS'Brad King2015-06-0412-179/+96
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e570f85 cmLocalGenerator: Remove 'optional' parameter from Convert. 3d8c6cd9 cmLocalGenerator: Remove obsolete method. e44e6bcc Port away from obsolete method. 1335992c Remove CMAKE_USE_RELATIVE_PATHS variable.
| * | | | cmLocalGenerator: Remove 'optional' parameter from Convert.Stephen Kelly2015-06-048-66/+47
| | | | | | | | | | | | | | | | | | | | Port callers away from it.
| * | | | cmLocalGenerator: Remove obsolete method.Stephen Kelly2015-06-032-15/+0
| | | | |
| * | | | Port away from obsolete method.Stephen Kelly2015-06-032-40/+38
| | | | |
| * | | | Remove CMAKE_USE_RELATIVE_PATHS variable.Stephen Kelly2015-06-037-60/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test for this variable was removed in commit v2.8.8~330^2~7 (complex: Remove ancient unused ComplexRelativePaths test, 2011-12-23). Commit v3.1.0-rc1~425^2~2 (backtrace: Convert to local paths in IssueMessage, 2014-03-12) appears to have accidentally made some backtraces print relative paths with the variable because conversions which used to be done at configure time, before the variable had an effect are now potentially done at generate time. The documentation of the variable says not to use it, and the docs are wrong in that the variable actually applies in per-directory scope. The read of the variable makes it harder to split conversion methods from cmLocalGenerator where they don't belong. Remove it now.
* | | | | Merge topic 'rename-cmState-API'Brad King2015-06-045-14/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf1233a0 cmState: Rename GetParent method. 942df88b cmState: Rename CreateSnapshot method. da28f115 cmState: Add CreateBaseSnapshot method.
| * | | | | cmState: Rename GetParent method.Stephen Kelly2015-06-024-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Leave the namespace open for other Parent types.
| * | | | | cmState: Rename CreateSnapshot method.Stephen Kelly2015-06-023-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Leave the namespace open for other snapshot types.
| * | | | | cmState: Add CreateBaseSnapshot method.Stephen Kelly2015-06-023-5/+16
| |/ / / /
* | | | | Merge topic 'minor-cleanups'Brad King2015-06-0415-75/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb7b6f6d cmVariableWatchCommand: Simplify error reporting. 499ebb65 cmListFileBacktrace: Internalize the step of making paths relative. 80b433b0 cmGlobalGenerator: Don't use else after a return. 52919ac8 cmMakefile: Make cmListFileBacktrace default constructible. b68f2ea8 cmMakefile: Add API for elseif to create backtrace. 17e13f0a cmMakefile: Simplify CMP0000 handling.
| * | | | | cmVariableWatchCommand: Simplify error reporting.Stephen Kelly2015-06-021-4/+1
| | | | | |
| * | | | | cmListFileBacktrace: Internalize the step of making paths relative.Stephen Kelly2015-06-023-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently cmMakefile calls MakeRelative on a copy of the backtrace, emits the copy to the stream once, then discards the copy. There is no need to have API for the path conversion.
| * | | | | cmGlobalGenerator: Don't use else after a return.Stephen Kelly2015-06-021-24/+19
| | | | | |
| * | | | | cmMakefile: Make cmListFileBacktrace default constructible.Stephen Kelly2015-06-028-10/+10
| | | | | |
| * | | | | cmMakefile: Add API for elseif to create backtrace.Stephen Kelly2015-06-023-5/+17
| | | | | |
| * | | | | cmMakefile: Simplify CMP0000 handling.Stephen Kelly2015-06-021-9/+4
| |/ / / /
* | | | | Merge topic 'ctest-merge-test-output'Brad King2015-06-046-22/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 721b7e3e CTest: Capture test stdout/stderr through one pipe (#15600)
| * | | | | CTest: Capture test stdout/stderr through one pipe (#15600)Brad King2015-06-036-22/+37
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the KWSys Process "MergeOutput" option to give each test child process the same pipe for both stdout and stderr. This allows natural merging of stdout and stderr together instead of merging on arbitrary buffered read boundaries as before.
* | | | | Merge topic 'vs-deterministic-guid'Brad King2015-06-048-71/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c85367f4 VS: Compute project GUIDs deterministically
| * | | | | VS: Compute project GUIDs deterministicallyBrad King2015-06-048-71/+22
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compute deterministic GUIDs that are unique to the build tree by hashing the path to the build tree with the GUID logical name. Avoid storing them in the cache, but honor any found there. This will allow project GUIDs to be reproduced in a fresh build tree so long as its path is the same as the original, which may be useful for incremental builds.
* | | | | Merge topic 'CPackDeb-dpkg-shlibdeps-check-flag'Brad King2015-06-041-7/+11
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | 39fc3ed7 CPackDeb: Check dpkg-shlibdeps --ignore-missing-info flag 54a95f5f CPackDeb: Check dpkg-shlibdeps version more robustly
| * | | | CPackDeb: Check dpkg-shlibdeps --ignore-missing-info flagBrad King2015-06-031-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for this flag explicitly in the --help output before using it. It turns out there are some versions of the tool that support --version but not --ignore-missing-info.
| * | | | CPackDeb: Check dpkg-shlibdeps version more robustlyBrad King2015-06-031-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Use if(MATCHES) to verify that a match exists before using the match group variable.
* | | | | CMake Nightly Date StampKitware Robot2015-06-041-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-06-031-1/+1
| |/ / / |/| | |
* | | | Begin post-3.3 developmentBrad King2015-06-023-2/+11
| | | |
* | | | Merge branch 'release'Brad King2015-06-024-13/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | CMake 3.3.0-rc1 version updateBrad King2015-06-022-4/+4
| | |
| * | Help: Drop development topic notes to prepare releaseBrad King2015-06-022-9/+0
|/ / | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* | Merge topic 'doc-3.3-relnotes'Brad King2015-06-0256-363/+294
|\ \ | | | | | | | | | | | | | | | c952d790 Help: Organize and revise 3.3 release notes 8ce87ac6 Help: Consolidate 3.3 release notes
| * | Help: Organize and revise 3.3 release notesBrad King2015-06-021-139/+169
| | | | | | | | | | | | | | | | | | Add section headers similar to the 3.2 release notes and move each individual bullet into an appropriate section. Revise and consolidate some bullets covering related areas.