diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-19 12:15:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-19 12:15:59 (GMT) |
| commit | d736b2ef3ac9fcf97b6a8de02337056e6fd0d971 (patch) | |
| tree | 252bf5f9368aa5c30d111ca8910640c7ddb2efd5 /Source | |
| parent | 2139987ba4c393d5405611d63f51153384dccfe0 (diff) | |
| parent | ab6e1e49c0ad2395cb1f5befb9e8908256b3910c (diff) | |
| download | CMake-d736b2ef3ac9fcf97b6a8de02337056e6fd0d971.zip CMake-d736b2ef3ac9fcf97b6a8de02337056e6fd0d971.tar.gz CMake-d736b2ef3ac9fcf97b6a8de02337056e6fd0d971.tar.bz2 | |
Merge topic 'test-extra-generators'
ab6e1e49c0 Tests: Simplify addition of extra generator tests
882483192d cmake: Simplify internal conditions for adding extra generators
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4909
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmake.cxx | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 162e807..62a7fcb 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -64,10 +64,6 @@ # include "cmVariableWatch.h" #endif -#if !defined(CMAKE_BOOTSTRAP) -# define CMAKE_USE_ECLIPSE -#endif - #if defined(__MINGW32__) && defined(CMAKE_BOOTSTRAP) # define CMAKE_BOOT_MINGW #endif @@ -101,16 +97,13 @@ #if !defined(CMAKE_BOOTSTRAP) # include "cmGlobalNinjaGenerator.h" #endif -#include "cmExtraCodeLiteGenerator.h" -#if !defined(CMAKE_BOOT_MINGW) +#if !defined(CMAKE_BOOTSTRAP) # include "cmExtraCodeBlocksGenerator.h" -#endif -#include "cmExtraKateGenerator.h" -#include "cmExtraSublimeTextGenerator.h" - -#ifdef CMAKE_USE_ECLIPSE +# include "cmExtraCodeLiteGenerator.h" # include "cmExtraEclipseCDT4Generator.h" +# include "cmExtraKateGenerator.h" +# include "cmExtraSublimeTextGenerator.h" #endif #if defined(__linux__) || defined(_WIN32) @@ -1137,13 +1130,9 @@ void cmake::AddDefaultExtraGenerators() #if !defined(CMAKE_BOOTSTRAP) this->ExtraGenerators.push_back(cmExtraCodeBlocksGenerator::GetFactory()); this->ExtraGenerators.push_back(cmExtraCodeLiteGenerator::GetFactory()); - this->ExtraGenerators.push_back(cmExtraSublimeTextGenerator::GetFactory()); - this->ExtraGenerators.push_back(cmExtraKateGenerator::GetFactory()); - -# ifdef CMAKE_USE_ECLIPSE this->ExtraGenerators.push_back(cmExtraEclipseCDT4Generator::GetFactory()); -# endif - + this->ExtraGenerators.push_back(cmExtraKateGenerator::GetFactory()); + this->ExtraGenerators.push_back(cmExtraSublimeTextGenerator::GetFactory()); #endif } |