|
|
@@ -49,6 +49,7 @@
|
|
|
#endif
|
|
|
#endif
|
|
|
|
|
|
+#include <memory> // auto_ptr
|
|
|
|
|
|
void cmNeedBackwardsCompatibility(const std::string& variable,
|
|
|
int access_type, void* )
|
|
|
@@ -57,7 +58,12 @@ void cmNeedBackwardsCompatibility(const std::string& variable,
|
|
|
{
|
|
|
std::string message = "An attempt was made to access a variable: ";
|
|
|
message += variable;
|
|
|
- message += " that has not been defined. Some variables were always defined by CMake in versions prior to 1.6. To fix this you might need to set the cache value of CMAKE_BACKWARDS_COMPATIBILITY to 1.4 or less. If you are writing a CMakeList file, (or have already set CMAKE_BACKWARDS_COMPATABILITY to 1.4 or less) then you probably need to include a CMake module to test for the feature this variable defines.";
|
|
|
+ message += " that has not been defined. Some variables were always defined "
|
|
|
+ "by CMake in versions prior to 1.6. To fix this you might need to set the "
|
|
|
+ "cache value of CMAKE_BACKWARDS_COMPATIBILITY to 1.4 or less. If you are "
|
|
|
+ "writing a CMakeList file, (or have already set "
|
|
|
+ "CMAKE_BACKWARDS_COMPATABILITY to 1.4 or less) then you probably need to "
|
|
|
+ "include a CMake module to test for the feature this variable defines.";
|
|
|
cmSystemTools::Error(message.c_str());
|
|
|
}
|
|
|
}
|
|
|
@@ -248,7 +254,7 @@ void cmake::ReadListFile(const char *path)
|
|
|
// read in the list file to fill the cache
|
|
|
if(path)
|
|
|
{
|
|
|
- cmLocalGenerator *lg = gg->CreateLocalGenerator();
|
|
|
+ std::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator());
|
|
|
lg->SetGlobalGenerator(gg);
|
|
|
if (!lg->GetMakefile()->ReadListFile(0, path))
|
|
|
{
|