[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1827-g853b8d4

[Stephen Kelly]

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  853b8d4f69b8d79f3ba8f4b57d5264c1fd843eb7 (commit)
       via  fd050d23318beb9a8606318c727bfd6203f302e3 (commit)
       via  4ec41c0d5e3ddded3480c4e4ab6838277d2e851a (commit)
      from  24afec3b34e14f4d68bd51331fc50fef3ce96700 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=853b8d4f69b8d79f3ba8f4b57d5264c1fd843eb7
commit 853b8d4f69b8d79f3ba8f4b57d5264c1fd843eb7
Merge: 24afec3 fd050d2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 3 16:39:57 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 3 16:39:57 2014 -0400

    Merge topic 'install-prefix-in-interface' into next
    
    fd050d23 Add explanatory comment.
    4ec41c0d Use a better summary.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd050d23318beb9a8606318c727bfd6203f302e3
commit fd050d23318beb9a8606318c727bfd6203f302e3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 3 22:37:10 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Apr 3 22:39:27 2014 +0200

    Add explanatory comment.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index b2e58ec..d25454d 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -279,6 +279,10 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (isSubDirectory(li->c_str(), installDir))
       {
+      // The include directory is inside the install tree.  If the
+      // install tree is not inside the build tree then fall through
+      // to the checks below that the include directory is not also
+      // inside the build tree.
       bool shouldContinue = isSubDirectory(installDir, topBinaryDir);
       if (!shouldContinue)
         {
@@ -304,7 +308,6 @@ static bool checkInterfaceDirs(const std::string &prepro,
           case cmPolicies::NEW:
             break;
           }
-        // OLD continue;
         }
       if (shouldContinue)
         {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ec41c0d5e3ddded3480c4e4ab6838277d2e851a
commit 4ec41c0d5e3ddded3480c4e4ab6838277d2e851a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 3 22:35:46 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Apr 3 22:35:46 2014 +0200

    Use a better summary.

diff --git a/Help/policy/CMP0052.rst b/Help/policy/CMP0052.rst
index 16b32f9f..f857f36 100644
--- a/Help/policy/CMP0052.rst
+++ b/Help/policy/CMP0052.rst
@@ -1,7 +1,7 @@
 CMP0052
 -------
 
-Disallow source and binary directories in INTERFACE_INCLUDE_DIRECTORIES.
+Reject source and build dirs in installed INTERFACE_INCLUDE_DIRECTORIES.
 
 CMake 3.0 and lower allowed subdirectories of the source directory or build
 directory to be in the :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` of
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 3cbd9b1..309f280 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -351,7 +351,7 @@ cmPolicies::cmPolicies()
 
   this->DefinePolicy(
     CMP0052, "CMP0052",
-    "Disallow source and binary directories in "
+    "Reject source and build dirs in installed "
     "INTERFACE_INCLUDE_DIRECTORIES.",
     3,1,0, cmPolicies::WARN);
 }
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 8947422..60f35c2 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -105,7 +105,7 @@ public:
     CMP0049, ///< Do not expand variables in target source entries
     CMP0050, ///< Disallow add_custom_command SOURCE signatures
     CMP0051, ///< List TARGET_OBJECTS in SOURCES target property
-    CMP0052, ///< Disallow source and binary directories in
+    CMP0052, ///< Reject source and build dirs in installed
     /// INTERFACE_INCLUDE_DIRECTORIES
 
     /** \brief Always the last entry.

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

Summary of changes:
 Help/policy/CMP0052.rst          |    2 +-
 Source/cmExportFileGenerator.cxx |    5 ++++-
 Source/cmPolicies.cxx            |    2 +-
 Source/cmPolicies.h              |    2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake