summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2010-09-16 21:50:07 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2010-09-16 21:50:07 (GMT)
commit2c82f2b75979208d9db6b514b0962f4e6b9aa05e (patch)
treeffe7a020521099612a6ef5b35e6c65c3eb757a75 /Source
parent6d7d449cb1c5d4438034936f3fb8f0e8a6800116 (diff)
downloadCMake-2c82f2b75979208d9db6b514b0962f4e6b9aa05e.zip
CMake-2c82f2b75979208d9db6b514b0962f4e6b9aa05e.tar.gz
CMake-2c82f2b75979208d9db6b514b0962f4e6b9aa05e.tar.bz2
Exempt CMAKE(CURRENT|PARENT)_LIST_FILE from usage
Diffstat (limited to 'Source')
-rw-r--r--Source/cmMakefile.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 38d8b6d..2908fa3 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -590,6 +590,7 @@ bool cmMakefile::ReadListFile(const char* filename_in,
std::string currentFile
= this->GetSafeDefinition("CMAKE_CURRENT_LIST_FILE");
this->AddDefinition("CMAKE_PARENT_LIST_FILE", filename_in);
+ this->MarkVariableAsUsed("CMAKE_PARENT_LIST_FILE");
const char* external = 0;
std::string external_abs;
@@ -630,6 +631,7 @@ bool cmMakefile::ReadListFile(const char* filename_in,
}
this->AddDefinition("CMAKE_CURRENT_LIST_FILE", filenametoread);
+ this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
// try to see if the list file is the top most
// list file for a project, and if it is, then it
@@ -662,7 +664,9 @@ bool cmMakefile::ReadListFile(const char* filename_in,
*fullPath = "";
}
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentParentFile.c_str());
+ this->MarkVariableAsUsed("CMAKE_PARENT_LIST_FILE");
this->AddDefinition("CMAKE_CURRENT_LIST_FILE", currentFile.c_str());
+ this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
return false;
}
// add this list file to the list of dependencies
@@ -702,7 +706,9 @@ bool cmMakefile::ReadListFile(const char* filename_in,
}
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentParentFile.c_str());
+ this->MarkVariableAsUsed("CMAKE_PARENT_LIST_FILE");
this->AddDefinition("CMAKE_CURRENT_LIST_FILE", currentFile.c_str());
+ this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
// pop the listfile off the stack
this->ListFileStack.pop_back();