summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-11-25 15:18:29 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-11-25 15:18:29 (GMT)
commit6a2c7e1e0ddcf8e14998c487b59afaf80a514279 (patch)
treeca72c9f0778bf4f711ee725422d164069f511195 /Source
parentc8da86a094f48830fcbcb0d2e68c063cae3da27b (diff)
parent26e98c34dc2a1414f79b6a12de3c4ca060af7578 (diff)
downloadCMake-6a2c7e1e0ddcf8e14998c487b59afaf80a514279.zip
CMake-6a2c7e1e0ddcf8e14998c487b59afaf80a514279.tar.gz
CMake-6a2c7e1e0ddcf8e14998c487b59afaf80a514279.tar.bz2
Merge topic 'file-GENERATE-rerun'
26e98c34 file(GENERATE): Re-run cmake when appropriate.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGeneratorExpressionEvaluationFile.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index 1a101dd..03d0bc6 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -80,6 +80,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(const std::string& config,
return;
}
+ this->Makefile->AddCMakeOutputFile(outputFileName.c_str());
this->Files.push_back(outputFileName);
outputFiles[outputFileName] = outputContent;
@@ -117,6 +118,7 @@ void cmGeneratorExpressionEvaluationFile::Generate()
}
else
{
+ this->Makefile->AddCMakeDependFile(this->Input.c_str());
cmSystemTools::GetPermissions(this->Input.c_str(), perm);
cmsys::ifstream fin(this->Input.c_str());
if(!fin)