ENH: make it so that bootstrap does not use xml parser
This commit is contained in:
parent
9062e6d922
commit
8ca558db9b
|
@ -23,8 +23,9 @@
|
||||||
#include "cmGeneratedFileStream.h"
|
#include "cmGeneratedFileStream.h"
|
||||||
#include "cmSourceFile.h"
|
#include "cmSourceFile.h"
|
||||||
#include "cmOrderLinkDirectories.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
|
// parse the xml file storing the installed version of Xcode on
|
||||||
// the machine
|
// the machine
|
||||||
|
@ -57,6 +58,7 @@ public:
|
||||||
std::string m_Key;
|
std::string m_Key;
|
||||||
std::string m_Data;
|
std::string m_Data;
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
//TODO
|
//TODO
|
||||||
|
@ -77,6 +79,7 @@ cmGlobalXCodeGenerator::cmGlobalXCodeGenerator()
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
cmGlobalGenerator* cmGlobalXCodeGenerator::New()
|
cmGlobalGenerator* cmGlobalXCodeGenerator::New()
|
||||||
{
|
{
|
||||||
|
#if defined(CMAKE_BUILD_WITH_CMAKE)
|
||||||
cmXcodeVersionParser parser;
|
cmXcodeVersionParser parser;
|
||||||
parser.ParseFile("/Developer/Applications/Xcode.app/Contents/version.plist");
|
parser.ParseFile("/Developer/Applications/Xcode.app/Contents/version.plist");
|
||||||
if(parser.m_Version == 15)
|
if(parser.m_Version == 15)
|
||||||
|
@ -91,6 +94,11 @@ cmGlobalGenerator* cmGlobalXCodeGenerator::New()
|
||||||
}
|
}
|
||||||
|
|
||||||
return new cmGlobalXCode21Generator;
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue