cmMakefile: Remove always-null first parameter to ReadListFile.
This commit is contained in:
parent
d21ebcb244
commit
6e23a4bddd
|
@ -525,7 +525,7 @@ int cmCPackGenerator::InstallProjectViaInstallScript(
|
||||||
tempInstallDirectory.c_str());
|
tempInstallDirectory.c_str());
|
||||||
this->SetOptionIfNotSet("CMAKE_CURRENT_SOURCE_DIR",
|
this->SetOptionIfNotSet("CMAKE_CURRENT_SOURCE_DIR",
|
||||||
tempInstallDirectory.c_str());
|
tempInstallDirectory.c_str());
|
||||||
int res = this->MakefileMap->ReadListFile(0, installScript.c_str());
|
int res = this->MakefileMap->ReadListFile(installScript.c_str());
|
||||||
if ( cmSystemTools::GetErrorOccuredFlag() || !res )
|
if ( cmSystemTools::GetErrorOccuredFlag() || !res )
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -888,7 +888,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
|
||||||
"1");
|
"1");
|
||||||
}
|
}
|
||||||
// do installation
|
// do installation
|
||||||
int res = mf->ReadListFile(0, installFile.c_str());
|
int res = mf->ReadListFile(installFile.c_str());
|
||||||
// forward definition of CMAKE_ABSOLUTE_DESTINATION_FILES
|
// forward definition of CMAKE_ABSOLUTE_DESTINATION_FILES
|
||||||
// to CPack (may be used by generators like CPack RPM or DEB)
|
// to CPack (may be used by generators like CPack RPM or DEB)
|
||||||
// in order to transparently handle ABSOLUTE PATH
|
// in order to transparently handle ABSOLUTE PATH
|
||||||
|
@ -980,7 +980,7 @@ bool cmCPackGenerator::ReadListFile(const char* moduleName)
|
||||||
{
|
{
|
||||||
bool retval;
|
bool retval;
|
||||||
std::string fullPath = this->MakefileMap->GetModulesFile(moduleName);
|
std::string fullPath = this->MakefileMap->GetModulesFile(moduleName);
|
||||||
retval = this->MakefileMap->ReadListFile(0, fullPath.c_str());
|
retval = this->MakefileMap->ReadListFile(fullPath.c_str());
|
||||||
// include FATAL_ERROR and ERROR in the return status
|
// include FATAL_ERROR and ERROR in the return status
|
||||||
retval = retval && (! cmSystemTools::GetErrorOccuredFlag());
|
retval = retval && (! cmSystemTools::GetErrorOccuredFlag());
|
||||||
return retval;
|
return retval;
|
||||||
|
@ -1163,7 +1163,7 @@ int cmCPackGenerator::Initialize(const std::string& name, cmMakefile* mf)
|
||||||
this->GetOption("CPACK_PROJECT_CONFIG_FILE");
|
this->GetOption("CPACK_PROJECT_CONFIG_FILE");
|
||||||
if(config)
|
if(config)
|
||||||
{
|
{
|
||||||
mf->ReadListFile(0, config);
|
mf->ReadListFile(config);
|
||||||
}
|
}
|
||||||
int result = this->InitializeInternal();
|
int result = this->InitializeInternal();
|
||||||
if (cmSystemTools::GetErrorOccuredFlag())
|
if (cmSystemTools::GetErrorOccuredFlag())
|
||||||
|
|
|
@ -244,7 +244,7 @@ int main (int argc, char const* const* argv)
|
||||||
// paths, so FIND_XXX() commands can be used in scripts
|
// paths, so FIND_XXX() commands can be used in scripts
|
||||||
std::string systemFile =
|
std::string systemFile =
|
||||||
globalMF->GetModulesFile("CMakeDetermineSystem.cmake");
|
globalMF->GetModulesFile("CMakeDetermineSystem.cmake");
|
||||||
if (!globalMF->ReadListFile(0, systemFile.c_str()))
|
if (!globalMF->ReadListFile(systemFile.c_str()))
|
||||||
{
|
{
|
||||||
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
|
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
|
||||||
"Error reading CMakeDetermineSystem.cmake" << std::endl);
|
"Error reading CMakeDetermineSystem.cmake" << std::endl);
|
||||||
|
@ -253,7 +253,7 @@ int main (int argc, char const* const* argv)
|
||||||
|
|
||||||
systemFile =
|
systemFile =
|
||||||
globalMF->GetModulesFile("CMakeSystemSpecificInformation.cmake");
|
globalMF->GetModulesFile("CMakeSystemSpecificInformation.cmake");
|
||||||
if (!globalMF->ReadListFile(0, systemFile.c_str()))
|
if (!globalMF->ReadListFile(systemFile.c_str()))
|
||||||
{
|
{
|
||||||
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
|
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
|
||||||
"Error reading CMakeSystemSpecificInformation.cmake" << std::endl);
|
"Error reading CMakeSystemSpecificInformation.cmake" << std::endl);
|
||||||
|
@ -272,7 +272,7 @@ int main (int argc, char const* const* argv)
|
||||||
cmCPack_Log(&log, cmCPackLog::LOG_VERBOSE,
|
cmCPack_Log(&log, cmCPackLog::LOG_VERBOSE,
|
||||||
"Read CPack configuration file: " << cpackConfigFile
|
"Read CPack configuration file: " << cpackConfigFile
|
||||||
<< std::endl);
|
<< std::endl);
|
||||||
if ( !globalMF->ReadListFile(0, cpackConfigFile.c_str()) )
|
if ( !globalMF->ReadListFile(cpackConfigFile.c_str()) )
|
||||||
{
|
{
|
||||||
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
|
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
|
||||||
"Problem reading CPack config file: \""
|
"Problem reading CPack config file: \""
|
||||||
|
|
|
@ -757,7 +757,7 @@ void cmCTestLaunch::LoadConfig()
|
||||||
std::string fname = this->LogDir;
|
std::string fname = this->LogDir;
|
||||||
fname += "CTestLaunchConfig.cmake";
|
fname += "CTestLaunchConfig.cmake";
|
||||||
if(cmSystemTools::FileExists(fname.c_str()) &&
|
if(cmSystemTools::FileExists(fname.c_str()) &&
|
||||||
mf->ReadListFile(0, fname.c_str()))
|
mf->ReadListFile(fname.c_str()))
|
||||||
{
|
{
|
||||||
this->SourceDir = mf->GetSafeDefinition("CTEST_SOURCE_DIRECTORY");
|
this->SourceDir = mf->GetSafeDefinition("CTEST_SOURCE_DIRECTORY");
|
||||||
cmSystemTools::ConvertToUnixSlashes(this->SourceDir);
|
cmSystemTools::ConvertToUnixSlashes(this->SourceDir);
|
||||||
|
|
|
@ -433,7 +433,7 @@ int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg)
|
||||||
ctest scripting easier. */
|
ctest scripting easier. */
|
||||||
std::string systemFile =
|
std::string systemFile =
|
||||||
this->Makefile->GetModulesFile("CTestScriptMode.cmake");
|
this->Makefile->GetModulesFile("CTestScriptMode.cmake");
|
||||||
if (!this->Makefile->ReadListFile(0, systemFile.c_str()) ||
|
if (!this->Makefile->ReadListFile(systemFile.c_str()) ||
|
||||||
cmSystemTools::GetErrorOccuredFlag())
|
cmSystemTools::GetErrorOccuredFlag())
|
||||||
{
|
{
|
||||||
cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in read:"
|
cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in read:"
|
||||||
|
@ -451,7 +451,7 @@ int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg)
|
||||||
}
|
}
|
||||||
|
|
||||||
// finally read in the script
|
// finally read in the script
|
||||||
if (!this->Makefile->ReadListFile(0, script.c_str()) ||
|
if (!this->Makefile->ReadListFile(script.c_str()) ||
|
||||||
cmSystemTools::GetErrorOccuredFlag())
|
cmSystemTools::GetErrorOccuredFlag())
|
||||||
{
|
{
|
||||||
// Reset the error flag so that it can run more than
|
// Reset the error flag so that it can run more than
|
||||||
|
|
|
@ -1617,7 +1617,7 @@ void cmCTestTestHandler::GetListOfTests()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !mf->ReadListFile(0, testFilename) )
|
if ( !mf->ReadListFile(testFilename) )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2576,7 +2576,7 @@ int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf)
|
||||||
bool erroroc = cmSystemTools::GetErrorOccuredFlag();
|
bool erroroc = cmSystemTools::GetErrorOccuredFlag();
|
||||||
cmSystemTools::ResetErrorOccuredFlag();
|
cmSystemTools::ResetErrorOccuredFlag();
|
||||||
|
|
||||||
if ( !mf->ReadListFile(0, fname.c_str()) ||
|
if ( !mf->ReadListFile(fname.c_str()) ||
|
||||||
cmSystemTools::GetErrorOccuredFlag() )
|
cmSystemTools::GetErrorOccuredFlag() )
|
||||||
{
|
{
|
||||||
cmCTestLog(this, ERROR_MESSAGE,
|
cmCTestLog(this, ERROR_MESSAGE,
|
||||||
|
@ -2606,7 +2606,7 @@ int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf)
|
||||||
{
|
{
|
||||||
cmCTestLog(this, DEBUG, "* Read custom CTest configuration file: "
|
cmCTestLog(this, DEBUG, "* Read custom CTest configuration file: "
|
||||||
<< *fileIt << std::endl);
|
<< *fileIt << std::endl);
|
||||||
if ( !mf->ReadListFile(0, fileIt->c_str()) ||
|
if ( !mf->ReadListFile(fileIt->c_str()) ||
|
||||||
cmSystemTools::GetErrorOccuredFlag() )
|
cmSystemTools::GetErrorOccuredFlag() )
|
||||||
{
|
{
|
||||||
cmCTestLog(this, ERROR_MESSAGE,
|
cmCTestLog(this, ERROR_MESSAGE,
|
||||||
|
|
|
@ -278,7 +278,7 @@ void cmGlobalGenerator::FindMakeProgram(cmMakefile* mf)
|
||||||
mf->GetModulesFile(this->FindMakeProgramFile.c_str());
|
mf->GetModulesFile(this->FindMakeProgramFile.c_str());
|
||||||
if(!setMakeProgram.empty())
|
if(!setMakeProgram.empty())
|
||||||
{
|
{
|
||||||
mf->ReadListFile(0, setMakeProgram.c_str());
|
mf->ReadListFile(setMakeProgram.c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!mf->GetDefinition("CMAKE_MAKE_PROGRAM")
|
if(!mf->GetDefinition("CMAKE_MAKE_PROGRAM")
|
||||||
|
@ -428,7 +428,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
|
||||||
fpath += "/CMakeSystem.cmake";
|
fpath += "/CMakeSystem.cmake";
|
||||||
if(cmSystemTools::FileExists(fpath.c_str()))
|
if(cmSystemTools::FileExists(fpath.c_str()))
|
||||||
{
|
{
|
||||||
mf->ReadListFile(0,fpath.c_str());
|
mf->ReadListFile(fpath.c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Load the CMakeDetermineSystem.cmake file and find out
|
// Load the CMakeDetermineSystem.cmake file and find out
|
||||||
|
@ -456,12 +456,12 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
|
||||||
#endif
|
#endif
|
||||||
// Read the DetermineSystem file
|
// Read the DetermineSystem file
|
||||||
std::string systemFile = mf->GetModulesFile("CMakeDetermineSystem.cmake");
|
std::string systemFile = mf->GetModulesFile("CMakeDetermineSystem.cmake");
|
||||||
mf->ReadListFile(0, systemFile.c_str());
|
mf->ReadListFile(systemFile.c_str());
|
||||||
// load the CMakeSystem.cmake from the binary directory
|
// load the CMakeSystem.cmake from the binary directory
|
||||||
// this file is configured by the CMakeDetermineSystem.cmake file
|
// this file is configured by the CMakeDetermineSystem.cmake file
|
||||||
fpath = rootBin;
|
fpath = rootBin;
|
||||||
fpath += "/CMakeSystem.cmake";
|
fpath += "/CMakeSystem.cmake";
|
||||||
mf->ReadListFile(0,fpath.c_str());
|
mf->ReadListFile(fpath.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
if(readCMakeSystem)
|
if(readCMakeSystem)
|
||||||
|
@ -495,7 +495,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
|
||||||
if (!mf->GetDefinition("CMAKE_SYSTEM_SPECIFIC_INITIALIZE_LOADED"))
|
if (!mf->GetDefinition("CMAKE_SYSTEM_SPECIFIC_INITIALIZE_LOADED"))
|
||||||
{
|
{
|
||||||
fpath = mf->GetModulesFile("CMakeSystemSpecificInitialize.cmake");
|
fpath = mf->GetModulesFile("CMakeSystemSpecificInitialize.cmake");
|
||||||
if(!mf->ReadListFile(0,fpath.c_str()))
|
if(!mf->ReadListFile(fpath.c_str()))
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("Could not find cmake module file: "
|
cmSystemTools::Error("Could not find cmake module file: "
|
||||||
"CMakeSystemSpecificInitialize.cmake");
|
"CMakeSystemSpecificInitialize.cmake");
|
||||||
|
@ -533,7 +533,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
|
||||||
// to avoid duplicate compiler tests.
|
// to avoid duplicate compiler tests.
|
||||||
if(cmSystemTools::FileExists(fpath.c_str()))
|
if(cmSystemTools::FileExists(fpath.c_str()))
|
||||||
{
|
{
|
||||||
if(!mf->ReadListFile(0,fpath.c_str()))
|
if(!mf->ReadListFile(fpath.c_str()))
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("Could not find cmake module file: ",
|
cmSystemTools::Error("Could not find cmake module file: ",
|
||||||
fpath.c_str());
|
fpath.c_str());
|
||||||
|
@ -563,7 +563,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
|
||||||
determineCompiler += "Compiler.cmake";
|
determineCompiler += "Compiler.cmake";
|
||||||
std::string determineFile =
|
std::string determineFile =
|
||||||
mf->GetModulesFile(determineCompiler.c_str());
|
mf->GetModulesFile(determineCompiler.c_str());
|
||||||
if(!mf->ReadListFile(0,determineFile.c_str()))
|
if(!mf->ReadListFile(determineFile.c_str()))
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("Could not find cmake module file: ",
|
cmSystemTools::Error("Could not find cmake module file: ",
|
||||||
determineCompiler.c_str());
|
determineCompiler.c_str());
|
||||||
|
@ -597,7 +597,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
|
||||||
fpath += "/CMake";
|
fpath += "/CMake";
|
||||||
fpath += lang;
|
fpath += lang;
|
||||||
fpath += "Compiler.cmake";
|
fpath += "Compiler.cmake";
|
||||||
if(!mf->ReadListFile(0,fpath.c_str()))
|
if(!mf->ReadListFile(fpath.c_str()))
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("Could not find cmake module file: ",
|
cmSystemTools::Error("Could not find cmake module file: ",
|
||||||
fpath.c_str());
|
fpath.c_str());
|
||||||
|
@ -616,7 +616,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
|
||||||
if (!mf->GetDefinition("CMAKE_SYSTEM_SPECIFIC_INFORMATION_LOADED"))
|
if (!mf->GetDefinition("CMAKE_SYSTEM_SPECIFIC_INFORMATION_LOADED"))
|
||||||
{
|
{
|
||||||
fpath = mf->GetModulesFile("CMakeSystemSpecificInformation.cmake");
|
fpath = mf->GetModulesFile("CMakeSystemSpecificInformation.cmake");
|
||||||
if(!mf->ReadListFile(0,fpath.c_str()))
|
if(!mf->ReadListFile(fpath.c_str()))
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("Could not find cmake module file: "
|
cmSystemTools::Error("Could not find cmake module file: "
|
||||||
"CMakeSystemSpecificInformation.cmake");
|
"CMakeSystemSpecificInformation.cmake");
|
||||||
|
@ -707,7 +707,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
|
||||||
cmSystemTools::Error("Could not find cmake module file: ",
|
cmSystemTools::Error("Could not find cmake module file: ",
|
||||||
fpath.c_str());
|
fpath.c_str());
|
||||||
}
|
}
|
||||||
else if(!mf->ReadListFile(0, informationFile.c_str()))
|
else if(!mf->ReadListFile(informationFile.c_str()))
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("Could not process cmake module file: ",
|
cmSystemTools::Error("Could not process cmake module file: ",
|
||||||
informationFile.c_str());
|
informationFile.c_str());
|
||||||
|
@ -732,7 +732,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
|
||||||
testLang += lang;
|
testLang += lang;
|
||||||
testLang += "Compiler.cmake";
|
testLang += "Compiler.cmake";
|
||||||
std::string ifpath = mf->GetModulesFile(testLang.c_str());
|
std::string ifpath = mf->GetModulesFile(testLang.c_str());
|
||||||
if(!mf->ReadListFile(0,ifpath.c_str()))
|
if(!mf->ReadListFile(ifpath.c_str()))
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("Could not find cmake module file: ",
|
cmSystemTools::Error("Could not find cmake module file: ",
|
||||||
testLang.c_str());
|
testLang.c_str());
|
||||||
|
@ -777,7 +777,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
|
||||||
projectCompatibility += "Compatibility.cmake";
|
projectCompatibility += "Compatibility.cmake";
|
||||||
if(cmSystemTools::FileExists(projectCompatibility.c_str()))
|
if(cmSystemTools::FileExists(projectCompatibility.c_str()))
|
||||||
{
|
{
|
||||||
mf->ReadListFile(0,projectCompatibility.c_str());
|
mf->ReadListFile(projectCompatibility.c_str());
|
||||||
}
|
}
|
||||||
// Inform any extra generator of the new language.
|
// Inform any extra generator of the new language.
|
||||||
if (this->ExtraGenerator)
|
if (this->ExtraGenerator)
|
||||||
|
|
|
@ -81,7 +81,7 @@ void cmGraphVizWriter::ReadSettings(const char* settingsFileName,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !mf->ReadListFile(0, inFileName) )
|
if ( !mf->ReadListFile(inFileName) )
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("Problem opening GraphViz options file: ",
|
cmSystemTools::Error("Problem opening GraphViz options file: ",
|
||||||
inFileName);
|
inFileName);
|
||||||
|
|
|
@ -1475,7 +1475,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
|
||||||
bool color)
|
bool color)
|
||||||
{
|
{
|
||||||
// read in the target info file
|
// read in the target info file
|
||||||
if(!this->Makefile->ReadListFile(0, tgtInfo) ||
|
if(!this->Makefile->ReadListFile(tgtInfo) ||
|
||||||
cmSystemTools::GetErrorOccuredFlag())
|
cmSystemTools::GetErrorOccuredFlag())
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("Target DependInfo.cmake file not found");
|
cmSystemTools::Error("Target DependInfo.cmake file not found");
|
||||||
|
@ -1592,7 +1592,7 @@ cmLocalUnixMakefileGenerator3
|
||||||
std::string dirInfoFile = this->Makefile->GetStartOutputDirectory();
|
std::string dirInfoFile = this->Makefile->GetStartOutputDirectory();
|
||||||
dirInfoFile += cmake::GetCMakeFilesDirectory();
|
dirInfoFile += cmake::GetCMakeFilesDirectory();
|
||||||
dirInfoFile += "/CMakeDirectoryInformation.cmake";
|
dirInfoFile += "/CMakeDirectoryInformation.cmake";
|
||||||
if(mf->ReadListFile(0, dirInfoFile.c_str()) &&
|
if(mf->ReadListFile(dirInfoFile.c_str()) &&
|
||||||
!cmSystemTools::GetErrorOccuredFlag())
|
!cmSystemTools::GetErrorOccuredFlag())
|
||||||
{
|
{
|
||||||
haveDirectoryInfo = true;
|
haveDirectoryInfo = true;
|
||||||
|
|
|
@ -526,7 +526,7 @@ bool cmMakefile::ProcessBuildsystemFile(const char* listfile)
|
||||||
{
|
{
|
||||||
this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile);
|
this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile);
|
||||||
this->cmCurrentListFile = listfile;
|
this->cmCurrentListFile = listfile;
|
||||||
return this->ReadListFile(0, listfile, true,
|
return this->ReadListFile(listfile, true,
|
||||||
this->cmStartDirectory == this->cmHomeDirectory);
|
this->cmStartDirectory == this->cmHomeDirectory);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -536,30 +536,20 @@ bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
|
||||||
this->cmCurrentListFile =
|
this->cmCurrentListFile =
|
||||||
cmSystemTools::CollapseFullPath(listfile,
|
cmSystemTools::CollapseFullPath(listfile,
|
||||||
this->cmStartDirectory.c_str());
|
this->cmStartDirectory.c_str());
|
||||||
return this->ReadListFile(0, this->cmCurrentListFile.c_str(),
|
return this->ReadListFile(this->cmCurrentListFile.c_str(),
|
||||||
noPolicyScope);
|
noPolicyScope);
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
// Parse the given CMakeLists.txt file executing all commands
|
// Parse the given CMakeLists.txt file executing all commands
|
||||||
//
|
//
|
||||||
bool cmMakefile::ReadListFile(const char* filename_in,
|
bool cmMakefile::ReadListFile(const char* listfile,
|
||||||
const char *external_in,
|
|
||||||
bool noPolicyScope,
|
bool noPolicyScope,
|
||||||
bool requireProjectCommand)
|
bool requireProjectCommand)
|
||||||
{
|
{
|
||||||
std::string filenametoread;
|
std::string filenametoread =
|
||||||
if (filename_in)
|
cmSystemTools::CollapseFullPath(listfile,
|
||||||
{
|
|
||||||
filenametoread = filename_in;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (external_in)
|
|
||||||
{
|
|
||||||
filenametoread =
|
|
||||||
cmSystemTools::CollapseFullPath(external_in,
|
|
||||||
this->cmStartDirectory.c_str());
|
this->cmStartDirectory.c_str());
|
||||||
}
|
|
||||||
|
|
||||||
std::string currentParentFile
|
std::string currentParentFile
|
||||||
= this->GetSafeDefinition("CMAKE_PARENT_LIST_FILE");
|
= this->GetSafeDefinition("CMAKE_PARENT_LIST_FILE");
|
||||||
|
|
|
@ -86,7 +86,6 @@ public:
|
||||||
* Read and parse a CMakeLists.txt file.
|
* Read and parse a CMakeLists.txt file.
|
||||||
*/
|
*/
|
||||||
bool ReadListFile(const char* listfile,
|
bool ReadListFile(const char* listfile,
|
||||||
const char* external= 0,
|
|
||||||
bool noPolicyScope = true,
|
bool noPolicyScope = true,
|
||||||
bool requireProjectCommand = false);
|
bool requireProjectCommand = false);
|
||||||
|
|
||||||
|
|
|
@ -1243,7 +1243,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
|
||||||
cmSystemTools::ConvertToUnixSlashes(filename);
|
cmSystemTools::ConvertToUnixSlashes(filename);
|
||||||
filename += "/AutogenInfo.cmake";
|
filename += "/AutogenInfo.cmake";
|
||||||
|
|
||||||
if (!makefile->ReadListFile(0, filename.c_str()))
|
if (!makefile->ReadListFile(filename.c_str()))
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("Error processing file: ", filename.c_str());
|
cmSystemTools::Error("Error processing file: ", filename.c_str());
|
||||||
return false;
|
return false;
|
||||||
|
@ -1413,7 +1413,7 @@ bool cmQtAutoGenerators::ReadOldMocDefinitionsFile(cmMakefile* makefile,
|
||||||
cmSystemTools::ConvertToUnixSlashes(filename);
|
cmSystemTools::ConvertToUnixSlashes(filename);
|
||||||
filename += "/AutomocOldMocDefinitions.cmake";
|
filename += "/AutomocOldMocDefinitions.cmake";
|
||||||
|
|
||||||
if (makefile->ReadListFile(0, filename.c_str()))
|
if (makefile->ReadListFile(filename.c_str()))
|
||||||
{
|
{
|
||||||
this->OldCompileSettingsStr =
|
this->OldCompileSettingsStr =
|
||||||
makefile->GetSafeDefinition("AM_OLD_COMPILE_SETTINGS");
|
makefile->GetSafeDefinition("AM_OLD_COMPILE_SETTINGS");
|
||||||
|
|
|
@ -388,7 +388,7 @@ void cmake::ReadListFile(const std::vector<std::string>& args,
|
||||||
|
|
||||||
lg->GetMakefile()->SetArgcArgv(args);
|
lg->GetMakefile()->SetArgcArgv(args);
|
||||||
}
|
}
|
||||||
if (!lg->GetMakefile()->ReadListFile(0, path))
|
if (!lg->GetMakefile()->ReadListFile(path))
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("Error processing file: ", path);
|
cmSystemTools::Error("Error processing file: ", path);
|
||||||
}
|
}
|
||||||
|
@ -424,7 +424,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
|
||||||
mf->SetArgcArgv(args);
|
mf->SetArgcArgv(args);
|
||||||
|
|
||||||
std::string systemFile = mf->GetModulesFile("CMakeFindPackageMode.cmake");
|
std::string systemFile = mf->GetModulesFile("CMakeFindPackageMode.cmake");
|
||||||
mf->ReadListFile(0, systemFile.c_str());
|
mf->ReadListFile(systemFile.c_str());
|
||||||
|
|
||||||
std::string language = mf->GetSafeDefinition("LANGUAGE");
|
std::string language = mf->GetSafeDefinition("LANGUAGE");
|
||||||
std::string mode = mf->GetSafeDefinition("MODE");
|
std::string mode = mf->GetSafeDefinition("MODE");
|
||||||
|
@ -1965,7 +1965,7 @@ int cmake::CheckBuildSystem()
|
||||||
gg.SetCMakeInstance(&cm);
|
gg.SetCMakeInstance(&cm);
|
||||||
cmsys::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator());
|
cmsys::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator());
|
||||||
cmMakefile* mf = lg->GetMakefile();
|
cmMakefile* mf = lg->GetMakefile();
|
||||||
if(!mf->ReadListFile(0, this->CheckBuildSystemArgument.c_str()) ||
|
if(!mf->ReadListFile(this->CheckBuildSystemArgument.c_str()) ||
|
||||||
cmSystemTools::GetErrorOccuredFlag())
|
cmSystemTools::GetErrorOccuredFlag())
|
||||||
{
|
{
|
||||||
if(verbose)
|
if(verbose)
|
||||||
|
|
Loading…
Reference in New Issue