diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-24 14:16:40 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-24 14:16:40 (GMT) |
| commit | b899c0a92f6833c4996276d86d9e0fb3d42df77c (patch) | |
| tree | 4a21fd3a3ac03ec9d5ae9a9acd9d7f7e0ee1af23 /Source/cmake.cxx | |
| parent | 3d5ec790eea47a91c6f70d172c42839db02b8467 (diff) | |
| parent | 569509f4bfbf44c67e237a01f957fdfe52223cfa (diff) | |
| download | CMake-b899c0a92f6833c4996276d86d9e0fb3d42df77c.zip CMake-b899c0a92f6833c4996276d86d9e0fb3d42df77c.tar.gz CMake-b899c0a92f6833c4996276d86d9e0fb3d42df77c.tar.bz2 | |
Merge topic 'separate-compilation'
569509f4 Fix newly discovered clang-tidy issues
6c9b3b5c cmCommand: implement functions in cxx file
8483dab8 bootstrap: Sort source files lexicographically
4fb70919 Create all commands from a single function
608afd4f Separate compilation for commands included in cmBootstrapCommands2
64f9c282 Separate compilation for commands included in cmBootstrapCommands1
f69e768d Separate compilation for commands included in cmCommands
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 44b76ef..eb76ca0 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1649,11 +1649,8 @@ const char* cmake::GetCacheDefinition(const std::string& name) const void cmake::AddDefaultCommands() { - std::vector<cmCommand*> commands; - GetBootstrapCommands1(commands); - GetBootstrapCommands2(commands); - GetPredefinedCommands(commands); - for (std::vector<cmCommand*>::iterator i = commands.begin(); + std::vector<cmCommand*> const commands = GetPredefinedCommands(); + for (std::vector<cmCommand*>::const_iterator i = commands.begin(); i != commands.end(); ++i) { this->State->AddCommand(*i); } |