diff options
author | Brad King <brad.king@kitware.com> | 2013-02-19 19:58:42 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-02-19 19:58:42 (GMT) |
commit | 71b217ecc9870bf5f25c202bbc1eb8b781803ba9 (patch) | |
tree | 0d7426633566e7211b0084ca98040ee3d312db54 /Source/cmake.cxx | |
parent | dea92c2f3947883d5d86dabd1040a4397e353e2a (diff) | |
parent | f616ff2c25e9902ed1cffc15f19d9299b83cba5a (diff) | |
download | CMake-71b217ecc9870bf5f25c202bbc1eb8b781803ba9.zip CMake-71b217ecc9870bf5f25c202bbc1eb8b781803ba9.tar.gz CMake-71b217ecc9870bf5f25c202bbc1eb8b781803ba9.tar.bz2 |
Merge topic 'sublime-text-2-generator'
f616ff2 Update generator to use new cmGeneratorTarget api.
674bd6e Merge branch 'master' into sublime-text-2-generator
4760ead Remove ability to generate sublime clang files.
da0898e Correct missing parameter to CMP0018Flags call.
badb40d Merge branch 'master' into sublime-text-2-generator
b3ae61f Merge branch 'master' into sublime-text-2-generator
089d9cc SublimeText 2 Gen: Set the sublimeclang_options_script property.
44c2eee Merge branch 'master' into sublime-text-2-generator
304b885 Sublime Text 2 Gen: Per-source Compile flags are now saved in a separate file.
5b2aa3d SublimeText2 Gen: Fixed the issue where include directory flags used -D
90bcb77 SublimeText2 Gen: Improved use of define, include flags from CMAKE_C(XX)_FLAGS
cc84072 Merge branch 'master' into sublime-text-2-generator
8670cbe Define flags in CMAKE_C(XX)_FLAGS are now included in SublimeClang settings.
d022d4e Merge branch 'master' into sublime-text-2-generator
9cd3e70 Fixed Sublime Text project generation for in-source builds
44f35f7 Added a CMAKE_SUBLIMECLANG_DISABLED variable that disables SublimeClang.
...
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r-- | Source/cmake.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index d44a36b..e2f80d1 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -88,6 +88,7 @@ #if !defined(CMAKE_BOOT_MINGW) # include "cmExtraCodeBlocksGenerator.h" #endif +#include "cmExtraSublimeTextGenerator.h" #ifdef CMAKE_USE_KDEVELOP # include "cmGlobalKdevelopGenerator.h" @@ -1878,6 +1879,8 @@ void cmake::AddDefaultExtraGenerators() this->AddExtraGenerator(cmExtraCodeBlocksGenerator::GetActualName(), &cmExtraCodeBlocksGenerator::New); + this->AddExtraGenerator(cmExtraSublimeTextGenerator::GetActualName(), + &cmExtraSublimeTextGenerator::New); #ifdef CMAKE_USE_ECLIPSE this->AddExtraGenerator(cmExtraEclipseCDT4Generator::GetActualName(), |