From 8ca558db9b1c5580334489fc56989d9c71bc4efc Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 19 Jul 2005 18:05:18 -0400 Subject: [PATCH] ENH: make it so that bootstrap does not use xml parser --- Source/cmGlobalXCodeGenerator.cxx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 1dece4af1..3e0809e6e 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -23,8 +23,9 @@ #include "cmGeneratedFileStream.h" #include "cmSourceFile.h" #include "cmOrderLinkDirectories.h" -#include "cmXMLParser.h" +#if defined(CMAKE_BUILD_WITH_CMAKE) +#include "cmXMLParser.h" // parse the xml file storing the installed version of Xcode on // the machine @@ -57,6 +58,7 @@ public: std::string m_Key; std::string m_Data; }; +#endif //TODO @@ -77,6 +79,7 @@ cmGlobalXCodeGenerator::cmGlobalXCodeGenerator() //---------------------------------------------------------------------------- cmGlobalGenerator* cmGlobalXCodeGenerator::New() { +#if defined(CMAKE_BUILD_WITH_CMAKE) cmXcodeVersionParser parser; parser.ParseFile("/Developer/Applications/Xcode.app/Contents/version.plist"); if(parser.m_Version == 15) @@ -91,6 +94,11 @@ cmGlobalGenerator* cmGlobalXCodeGenerator::New() } return new cmGlobalXCode21Generator; +#else + std::cerr + << "CMake should be built with cmake to use XCode, default to Xcode 1.5\n"; + return new cmGlobalXCodeGenerator; +#endif } //----------------------------------------------------------------------------