diff options
| -rw-r--r-- | Source/cmExportFileGenerator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmExportInstallFileGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmInstallExportGenerator.cxx | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index d13253a..3661f07 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -996,11 +996,12 @@ void cmExportFileGenerator::GenerateExpectedTargetsCode( " list(APPEND _cmake_targets_not_defined \"${_cmake_expected_target}\")\n" " endif()\n" "endforeach()\n" + "unset(_cmake_expected_target)\n" "if(_cmake_targets_defined STREQUAL _cmake_expected_targets)\n" " unset(_cmake_targets_defined)\n" " unset(_cmake_targets_not_defined)\n" " unset(_cmake_expected_targets)\n" - " set(CMAKE_IMPORT_FILE_VERSION)\n" + " unset(CMAKE_IMPORT_FILE_VERSION)\n" " cmake_policy(POP)\n" " return()\n" "endif()\n" @@ -1192,8 +1193,10 @@ void cmExportFileGenerator::GenerateImportedFileCheckLoop(std::ostream& os) "\")\n" " endif()\n" " endforeach()\n" + " unset(_cmake_file)\n" " unset(\"_cmake_import_check_files_for_${_cmake_target}\")\n" "endforeach()\n" + "unset(_cmake_target)\n" "unset(_cmake_import_check_targets)\n" "\n"; /* clang-format on */ diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index 7de1230..06fd453 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -259,6 +259,8 @@ void cmExportInstallFileGenerator::LoadConfigFiles(std::ostream& os) << "foreach(_cmake_config_file IN LISTS _cmake_config_files)\n" << " include(\"${_cmake_config_file}\")\n" << "endforeach()\n" + << "unset(_cmake_config_file)\n" + << "unset(_cmake_config_files)\n" << "\n"; /* clang-format on */ } diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx index eadfd2e..18ce601 100644 --- a/Source/cmInstallExportGenerator.cxx +++ b/Source/cmInstallExportGenerator.cxx @@ -206,7 +206,9 @@ void cmInstallExportGenerator::GenerateScriptActions(std::ostream& os, << "\\\" will be replaced. Removing files [${_cmake_old_config_files}].\")\n"; os << indentNNN << "file(REMOVE ${_cmake_old_config_files})\n"; os << indentNN << "endif()\n"; + os << indentNN << "unset(_cmake_old_config_files)\n"; os << indentN << "endif()\n"; + os << indentN << "unset(_cmake_export_file_changed)\n"; os << indent << "endif()\n"; /* clang-format on */ |