[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3967-gf515810

[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  f515810372c2240ca666abc7465ac998eb34556c (commit)
       via  3ab9f2b9d60af07a44b94602f5fb63c1ad5886d6 (commit)
      from  774293083ca32a70d9dde621931eb81096d314e2 (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=f515810372c2240ca666abc7465ac998eb34556c
commit f515810372c2240ca666abc7465ac998eb34556c
Merge: 7742930 3ab9f2b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 22 18:07:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 22 18:07:00 2013 -0400

    Merge topic 'fix-OLD-CMP0021' into next
    
    3ab9f2b Fix OLD behavior of CMP0021.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ab9f2b9d60af07a44b94602f5fb63c1ad5886d6
commit 3ab9f2b9d60af07a44b94602f5fb63c1ad5886d6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 22 23:52:00 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 23 00:02:02 2013 +0200

    Fix OLD behavior of CMP0021.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 13cd006..ddb4e85 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3303,7 +3303,10 @@ static void processIncludeDirectories(cmTarget *tgt,
         if (!noMessage)
           {
           tgt->GetMakefile()->IssueMessage(messageType, e.str().c_str());
-          return;
+          if (messageType == cmake::FATAL_ERROR)
+            {
+            return;
+            }
           }
         }
 
diff --git a/Tests/IncludeDirectories/CMP0021/CMakeLists.txt b/Tests/IncludeDirectories/CMP0021/CMakeLists.txt
new file mode 100644
index 0000000..f449e90
--- /dev/null
+++ b/Tests/IncludeDirectories/CMP0021/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+cmake_policy(SET CMP0021 OLD)
+add_executable(cmp0021exe main.cpp)
+
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/includes")
+execute_process(COMMAND ${CMAKE_COMMAND} -E
+  copy_directory
+  "${CMAKE_CURRENT_SOURCE_DIR}/includes"
+  "${CMAKE_CURRENT_BINARY_DIR}/includes"
+)
+set_property(TARGET cmp0021exe PROPERTY
+  INCLUDE_DIRECTORIES includes/cmp0021)
diff --git a/Tests/IncludeDirectories/CMP0021/includes/cmp0021/cmp0021.h b/Tests/IncludeDirectories/CMP0021/includes/cmp0021/cmp0021.h
new file mode 100644
index 0000000..3d49b31
--- /dev/null
+++ b/Tests/IncludeDirectories/CMP0021/includes/cmp0021/cmp0021.h
@@ -0,0 +1,2 @@
+
+#define CMP0021_DEFINE
diff --git a/Tests/IncludeDirectories/CMP0021/main.cpp b/Tests/IncludeDirectories/CMP0021/main.cpp
new file mode 100644
index 0000000..f886c46
--- /dev/null
+++ b/Tests/IncludeDirectories/CMP0021/main.cpp
@@ -0,0 +1,11 @@
+
+#include "cmp0021.h"
+
+#ifndef CMP0021_DEFINE
+#error Expected CMP0021_DEFINE
+#endif
+
+int main(int, char **)
+{
+  return 0;
+}
diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
index 596a280..3493172 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -86,3 +86,5 @@ get_target_property(incs empty_entry_test INCLUDE_DIRECTORIES)
 if (NOT incs STREQUAL ";/one/two")
   message(SEND_ERROR "Empty include_directories entry was not ignored.")
 endif()
+
+add_subdirectory(CMP0021)

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

Summary of changes:
 Source/cmTarget.cxx                                |    5 ++++-
 Tests/IncludeDirectories/CMP0021/CMakeLists.txt    |   12 ++++++++++++
 .../CMP0021/includes/cmp0021/cmp0021.h             |    2 ++
 Tests/IncludeDirectories/CMP0021/main.cpp          |   11 +++++++++++
 Tests/IncludeDirectories/CMakeLists.txt            |    2 ++
 5 files changed, 31 insertions(+), 1 deletions(-)
 create mode 100644 Tests/IncludeDirectories/CMP0021/CMakeLists.txt
 create mode 100644 Tests/IncludeDirectories/CMP0021/includes/cmp0021/cmp0021.h
 create mode 100644 Tests/IncludeDirectories/CMP0021/main.cpp


hooks/post-receive
-- 
CMake