summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ExternalData: Add option to disable use of symlinksBrad King2015-05-227-1/+32
| | | | | | | | | Add an ExternalData_NO_SYMLINKS to enable use of copies instead of symlinks to populate the real data files behind a DATA{} reference. This will be useful on UNIX-like systems when the underlying filesystem does not actually support symbolic links. Suggested-by: Matt McCormick <matt.mccormick@kitware.com>
* Merge topic 'ExternalProject_FixLog'Brad King2015-05-212-2/+39
|\ | | | | | | | | a0d620de ExternalProject: Fix log when the first arg of commands is "COMMAND" (#15567)
| * ExternalProject: Fix log when the first arg of commands is "COMMAND" (#15567)Daniele E. Domenichelli2015-05-202-2/+39
| |
* | Merge topic 'use-std-unordered_map'Brad King2015-05-211-1/+3
|\ \ | | | | | | | | | | | | b5906ed0 Check for std::unordered_map only if we are building CMake
| * | Check for std::unordered_map only if we are building CMakeBrad King2015-05-201-1/+3
| | | | | | | | | | | | | | | When CMake_TEST_EXTERNAL_CMAKE is set then we are not actually building CMake so we do not need this check.
* | | Merge topic 'clean-up-cmLocalGenerator'Brad King2015-05-215-26/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e54d2fdf Convert: Remove specification of default parameter. 20c2fe4d cmLocalGenerator: Get enabled languages from cmState. 7601a7b1 cmLocalGenerator: Implement IsRootMakefile in terms of cmState. 4080ca49 cmLocalGenerator: Inline ReadListFile method. ad706819 cmLocalGenerator: Devirtualize method.
| * | | Convert: Remove specification of default parameter.Stephen Kelly2015-05-204-7/+5
| | | |
| * | | cmLocalGenerator: Get enabled languages from cmState.Stephen Kelly2015-05-201-2/+2
| | | |
| * | | cmLocalGenerator: Implement IsRootMakefile in terms of cmState.Stephen Kelly2015-05-201-1/+1
| | | |
| * | | cmLocalGenerator: Inline ReadListFile method.Stephen Kelly2015-05-202-15/+4
| | | |
| * | | cmLocalGenerator: Devirtualize method.Stephen Kelly2015-05-201-1/+1
| | | |
* | | | Merge topic 'clean-up-CMAKE_COMMAND'Brad King2015-05-2116-56/+32
|\ \ \ \ | |/ / / | | | | | | | | | | | | 6fbd4cae Use cmSystemTools::GetCMakeCommand() to get path to cmake internally
| * | | Use cmSystemTools::GetCMakeCommand() to get path to cmake internallyBrad King2015-05-2016-56/+32
| | | | | | | | | | | | | | | | | | | | This is much simpler than finding a way to lookup "CMAKE_COMMAND" everywhere.
* | | | Merge topic 'cmake-gui-osx-install-command-line'Brad King2015-05-217-263/+109
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e462ef74 Help: Add notes for topic 'cmake-gui-osx-install-command-line' 8ea2db26 cmake-gui: Replace command-line install dialog with information box 438ce4a0 cmake-gui: Add --install option to add command-line tools on OS X 41477d5c cmake-gui: Drop undocumented and unused --mac-install option
| * | | | Help: Add notes for topic 'cmake-gui-osx-install-command-line'Brad King2015-05-211-0/+10
| | | | |
| * | | | cmake-gui: Replace command-line install dialog with information boxBrad King2015-05-216-253/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QMacInstallDialog infrastructure no longer works on modern OS X versions. Drop it and replace the dialog with a simple info box that explains to the user how to run 'cmake-gui --install' to add symlinks. Also suggest simply modifying the PATH. This approach is similar to the Xcode 'xcode-select --install' method of installing Xcode Command Line Tools.
| * | | | cmake-gui: Add --install option to add command-line tools on OS XBrad King2015-05-211-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On OS X add an "--install[=/path/to/bin]" option (defaulting to /usr/bin) that installs symbolic links into the given directory. This will help OS X users make the tools available on the command line even when they sit inside a CMake.app bundle.
| * | | | cmake-gui: Drop undocumented and unused --mac-install optionBrad King2015-05-191-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option was once used by our OS X package installer to create symlinks at install time. Since switching to the DragNDrop installer we no longer use this option.
* | | | | Merge topic 'doc-cache-option-space'Brad King2015-05-213-2/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b0ea3673 Help: Spell '-D' option consistently across documentation (#15575)
| * | | | | Help: Spell '-D' option consistently across documentation (#15575)Brad King2015-05-203-2/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Always show the option with its argument separate in summary text. State in the main documentation that the option and its argument can be given together too.
* | | | | Merge topic 'clean-up-cmQtAutoGenerators'Brad King2015-05-211-26/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5b59fae QtAutogen: Create global generator on the stack. fe401ede QtAutogen: Use a more-obvious delete-target. c95a55ad QtAutogen: Remove the need for a local makefile variable. 460e8fb9 QtAutogen: Inline static factory method. 58f41c78 QtAutogen: Remove repeated setters.
| * | | | | QtAutogen: Create global generator on the stack.Stephen Kelly2015-05-191-6/+4
| | | | | |
| * | | | | QtAutogen: Use a more-obvious delete-target.Stephen Kelly2015-05-191-1/+1
| | | | | |
| * | | | | QtAutogen: Remove the need for a local makefile variable.Stephen Kelly2015-05-191-6/+3
| | | | | |
| * | | | | QtAutogen: Inline static factory method.Stephen Kelly2015-05-191-14/+7
| | | | | |
| * | | | | QtAutogen: Remove repeated setters.Stephen Kelly2015-05-191-3/+0
| |/ / / / | | | | | | | | | | | | | | | These methods are called already just before calling the static method.
* | | | | Merge topic 'clean-up-cmMakefile'Brad King2015-05-219-247/+118
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9f99155 cmMakefile: Remove VarUsageStack. 2b09d9f3 cmMakefile: Remove VarInitStack. 528d6802 cmMakefile: Use more suitable method name to log var usage. 9118b53b cmMakefile: Move internal method to private scope. f58c3774 cmMakefile: Mark definitions explicitly erased, even at top level. ea7b962b cmMakefile: Raise variable in scope explicitly when needed. c8cb6688 cmMakefile: Use early return to reduce nested code. bdd1aa91 cmMakefile: Don't use else after return. c42f0e2b cmMakefile: Remove redundant conditions. caff8e5a cmCTest: Remove unimplemented method. bb1e8c3a cmMakefile: Remove Print() debugging facilities. 1363bff8 cmMakefile: Remove duplicate variable initialization. 5b7ff35c cmMakefile: Don't expect the VarStack iterator to support size(). 390bc324 cmMakefile: Remove redundant condition. 8ab1cce7 cmMakefile: Rename method to something more appropriate. 2dd5d42f cmMakefile: Make the public ReadListFile method take one param. ...
| * | | | | cmMakefile: Remove VarUsageStack.Stephen Kelly2015-05-194-61/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store usage information in the cmDefintions value instead. We already pay for the memory as padding in the Def struct, so we might as well use it.
| * | | | | cmMakefile: Remove VarInitStack.Stephen Kelly2015-05-193-21/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmMakefile::PushScope, a copy of the closure of keys initialized in the parent scope is made. In PopScope, essentially the same copy is inserted back into the parent. That means a lot of duplication of strings and a lot of string comparisons. None of it is needed, because the cmDefinitions keys already provide a canonical representation of what is initialized. The removal of the separate container also makes the variable handling code more easy to reason about in general. Before this patch, configuring llvm uses 200 KiB for the VarInitStack. Overall peak memory consumption goes from 35.5 MiB to 35.1 MiB.
| * | | | | cmMakefile: Use more suitable method name to log var usage.Stephen Kelly2015-05-192-7/+7
| | | | | |
| * | | | | cmMakefile: Move internal method to private scope.Stephen Kelly2015-05-191-2/+2
| | | | | |
| * | | | | cmMakefile: Mark definitions explicitly erased, even at top level.Stephen Kelly2015-05-193-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Presumably the intention here is to attempt to optimize memory by not storing what is not needed. However, all keys need to be tracked anyway to implement initialization tracking, and this special case gets in the way of simplifying the implementation of that. This doesn't change any observable effects because values set to 0 are considered not to exist by the cmDefinitions API.
| * | | | | cmMakefile: Raise variable in scope explicitly when needed.Stephen Kelly2015-05-193-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Get method implicitly pulls a copy of all variables into a local scope. This is not necessary.
| * | | | | cmMakefile: Use early return to reduce nested code.Stephen Kelly2015-05-191-15/+16
| | | | | |
| * | | | | cmMakefile: Don't use else after return.Stephen Kelly2015-05-191-4/+1
| | | | | |
| * | | | | cmMakefile: Remove redundant conditions.Stephen Kelly2015-05-191-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | This container is never empty.
| * | | | | cmCTest: Remove unimplemented method.Stephen Kelly2015-05-191-5/+0
| | | | | |
| * | | | | cmMakefile: Remove Print() debugging facilities.Stephen Kelly2015-05-192-62/+0
| | | | | | | | | | | | | | | | | | | | | | | | They don't print things that are important in the modern implementation.
| * | | | | cmMakefile: Remove duplicate variable initialization.Stephen Kelly2015-05-191-4/+2
| | | | | |
| * | | | | cmMakefile: Don't expect the VarStack iterator to support size().Stephen Kelly2015-05-191-2/+1
| | | | | |
| * | | | | cmMakefile: Remove redundant condition.Stephen Kelly2015-05-191-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this is called in the constructor, the definition will never be already set.
| * | | | | cmMakefile: Rename method to something more appropriate.Stephen Kelly2015-05-194-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Allow the name to be used for something more-suitable.
| * | | | | cmMakefile: Make the public ReadListFile method take one param.Stephen Kelly2015-05-192-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the existing method a private overload. All external callers invoke the method with only one argument.
| * | | | | cmMakefile: Remove CurrentListFile member.Stephen Kelly2015-05-192-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is never read externally. The CollapseFullPath removed in this commit is a repeat of a similar call inside ReadListFile.
| * | | | | cmMakefile: Port CurrentListFile clients to GetDefinition.Stephen Kelly2015-05-193-4/+7
| |/ / / / | | | | | | | | | | | | | | | There is no need to store this as a member variable.
* | | | | Merge topic 'doc-cmake-buildsystem-typo'Brad King2015-05-211-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7412d100 Help: Fix typo in cmake-buildsystem(7) manual
| * | | | | Help: Fix typo in cmake-buildsystem(7) manualBrad King2015-05-191-2/+2
| |/ / / /
* | | | | Merge topic 'run-include-what-you-use'Brad King2015-05-2128-0/+207
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ada5ffce Add options to run include-what-you-use with the compiler 67fa3da9 cmake: Add internal -E mode to run include-what-you-use with the compiler
| * | | | | Add options to run include-what-you-use with the compilerBrad King2015-05-1918-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a <LANG>_INCLUDE_WHAT_YOU_USE target property (initialized by a CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE variable) to specify an IWYU command line to be run along with the compiler.
| * | | | | cmake: Add internal -E mode to run include-what-you-use with the compilerBill Hoffman2015-05-1910-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an internal "cmake -E __run_iwyu" mode to wrap the compiler call. Run a given include-what-you-use command line with the compiler options and report a warning if it finds anything. Then run the real compiler. Co-Author: Brad King <brad.king@kitware.com>