[Cmake-commits] CMake branch, next, updated. v3.5.2-1270-g849c147

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  849c147c37743c180494f05bd14bb5635ee777c3 (commit)
       via  f45c16e7ee562f9918b75134b54b92661c5a98c8 (commit)
      from  1fbd9307f90697964e412500a72fb39d94bc1e55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=849c147c37743c180494f05bd14bb5635ee777c3
commit 849c147c37743c180494f05bd14bb5635ee777c3
Merge: 1fbd930 f45c16e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 6 08:34:01 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 6 08:34:01 2016 -0400

    Merge topic 'fix-export-unset' into next
    
    f45c16e7 Fix export file variable pollution


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f45c16e7ee562f9918b75134b54b92661c5a98c8
commit f45c16e7ee562f9918b75134b54b92661c5a98c8
Author:     Matthew Woehlke <matthew.woehlke at kitware.com>
AuthorDate: Thu May 5 11:33:56 2016 -0400
Commit:     Matthew Woehlke <matthew.woehlke at kitware.com>
CommitDate: Thu May 5 11:33:56 2016 -0400

    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.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 2b3ce14..89a8f6c 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1040,6 +1040,9 @@ void cmExportFileGenerator::GenerateExpectedTargetsCode(std::ostream& os,
         "  endif()\n"
         "endforeach()\n"
         "if(\"${_targetsDefined}\" STREQUAL \"${_expectedTargets}\")\n"
+        "  unset(_targetsDefined)\n"
+        "  unset(_targetsNotDefined)\n"
+        "  unset(_expectedTargets)\n"
         "  set(CMAKE_IMPORT_FILE_VERSION)\n"
         "  cmake_policy(POP)\n"
         "  return()\n"

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportFileGenerator.cxx |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake