kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: do not build kdevlop stuff when bootstrapping

This commit is contained in:
Bill Hoffman 2004-10-12 09:50:36 -04:00
parent 800784175f
commit 832a302ca2
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmake.cxx
View File

@ -23,6 +23,14 @@
#include "cmCommand.h" #include "cmCommand.h"
#include "cmVariableWatch.h" #include "cmVariableWatch.h"
// only build kdevelop generator on non-windows platforms
// when not bootstrapping cmake
#if !defined(_WIN32)
# if defined(CMAKE_BUILD_WITH_CMAKE)
# define CMAKE_USE_KDEVELOP
# endif
#endif
// include the generator // include the generator
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
# include "cmGlobalVisualStudio6Generator.h" # include "cmGlobalVisualStudio6Generator.h"
@ -37,7 +45,10 @@
#else #else
#endif #endif
#include "cmGlobalUnixMakefileGenerator.h" #include "cmGlobalUnixMakefileGenerator.h"
#include "cmGlobalKdevelopGenerator.h"
#ifdef CMAKE_USE_KDEVELOP
# include "cmGlobalKdevelopGenerator.h"
#endif
#include <stdlib.h> // required for atoi #include <stdlib.h> // required for atoi
@ -1415,7 +1426,7 @@ void cmake::AddDefaultGenerators()
#endif #endif
m_Generators[cmGlobalUnixMakefileGenerator::GetActualName()] = m_Generators[cmGlobalUnixMakefileGenerator::GetActualName()] =
&cmGlobalUnixMakefileGenerator::New; &cmGlobalUnixMakefileGenerator::New;
#if !defined(_WIN32) #ifdef CMAKE_USE_KDEVELOP
m_Generators[cmGlobalKdevelopGenerator::GetActualName()] = m_Generators[cmGlobalKdevelopGenerator::GetActualName()] =
&cmGlobalKdevelopGenerator::New; &cmGlobalKdevelopGenerator::New;
#endif #endif

2
bootstrap
View File

@ -35,8 +35,6 @@ CMAKE_CXX_SOURCES="\
cmSystemTools \ cmSystemTools \
cmGlobalUnixMakefileGenerator \ cmGlobalUnixMakefileGenerator \
cmLocalUnixMakefileGenerator \ cmLocalUnixMakefileGenerator \
cmGlobalKdevelopGenerator \
cmLocalKdevelopGenerator \
cmCommands \ cmCommands \
cmTarget \ cmTarget \
cmCustomCommand \ cmCustomCommand \