浏览代码

Fix export file variable pollution

Add missing unset of scratch variables to generated export file for case
that the file was already included. We already unset these when parsing
the file normally, but the multiple inclusion case was leaving them
around.
Matthew Woehlke 9 年之前
父节点
当前提交
f45c16e7ee
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      Source/cmExportFileGenerator.cxx

+ 3 - 0
Source/cmExportFileGenerator.cxx

@@ -1040,6 +1040,9 @@ void cmExportFileGenerator::GenerateExpectedTargetsCode(std::ostream& os,
         "  endif()\n"
         "  endif()\n"
         "endforeach()\n"
         "endforeach()\n"
         "if(\"${_targetsDefined}\" STREQUAL \"${_expectedTargets}\")\n"
         "if(\"${_targetsDefined}\" STREQUAL \"${_expectedTargets}\")\n"
+        "  unset(_targetsDefined)\n"
+        "  unset(_targetsNotDefined)\n"
+        "  unset(_expectedTargets)\n"
         "  set(CMAKE_IMPORT_FILE_VERSION)\n"
         "  set(CMAKE_IMPORT_FILE_VERSION)\n"
         "  cmake_policy(POP)\n"
         "  cmake_policy(POP)\n"
         "  return()\n"
         "  return()\n"