diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 2296d5a33..32898812e 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -43,19 +43,12 @@ #include // for isspace #include -class cmMakefile::Internals -{ -public: - bool IsSourceFileTryCompile; -}; - // default is not to be building executables cmMakefile::cmMakefile(cmLocalGenerator* localGenerator) - : Internal(new Internals), - LocalGenerator(localGenerator), + : LocalGenerator(localGenerator), StateSnapshot(localGenerator->GetStateSnapshot()) { - this->Internal->IsSourceFileTryCompile = false; + this->IsSourceFileTryCompile = false; // Initialize these first since AddDefaultDefinitions calls AddDefinition this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused(); @@ -3616,7 +3609,7 @@ int cmMakefile::TryCompile(const std::string& srcdir, const std::vector *cmakeArgs, std::string& output) { - this->Internal->IsSourceFileTryCompile = fast; + this->IsSourceFileTryCompile = fast; // does the binary directory exist ? If not create it... if (!cmSystemTools::FileIsDirectory(bindir)) { @@ -3641,7 +3634,7 @@ int cmMakefile::TryCompile(const std::string& srcdir, "Internal CMake error, TryCompile bad GlobalGenerator"); // return to the original directory cmSystemTools::ChangeDirectory(cwd); - this->Internal->IsSourceFileTryCompile = false; + this->IsSourceFileTryCompile = false; return 1; } cm.SetGlobalGenerator(gg); @@ -3712,7 +3705,7 @@ int cmMakefile::TryCompile(const std::string& srcdir, "Internal CMake error, TryCompile configure of cmake failed"); // return to the original directory cmSystemTools::ChangeDirectory(cwd); - this->Internal->IsSourceFileTryCompile = false; + this->IsSourceFileTryCompile = false; return 1; } @@ -3722,7 +3715,7 @@ int cmMakefile::TryCompile(const std::string& srcdir, "Internal CMake error, TryCompile generation of cmake failed"); // return to the original directory cmSystemTools::ChangeDirectory(cwd); - this->Internal->IsSourceFileTryCompile = false; + this->IsSourceFileTryCompile = false; return 1; } @@ -3735,13 +3728,13 @@ int cmMakefile::TryCompile(const std::string& srcdir, this); cmSystemTools::ChangeDirectory(cwd); - this->Internal->IsSourceFileTryCompile = false; + this->IsSourceFileTryCompile = false; return ret; } bool cmMakefile::GetIsSourceFileTryCompile() const { - return this->Internal->IsSourceFileTryCompile; + return this->IsSourceFileTryCompile; } cmake *cmMakefile::GetCMakeInstance() const diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 055170a62..1f8a05482 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -62,8 +62,6 @@ class cmGeneratorExpressionEvaluationFile; */ class cmMakefile { - class Internals; - cmsys::auto_ptr Internal; public: /* Mark a variable as used */ void MarkVariableAsUsed(const std::string& var); @@ -996,6 +994,7 @@ private: bool CheckSystemVars; bool CheckCMP0000; bool Configured; + bool IsSourceFileTryCompile; mutable bool SuppressWatches; };