[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3971-g333d416

[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  333d4168251abc5a7a64d500109e7dbad5a57bc3 (commit)
       via  d0d45eefaef0a4151163457f7aa601482aaaec88 (commit)
      from  583017574c634697aa8f4d5f3395f244bae15821 (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=333d4168251abc5a7a64d500109e7dbad5a57bc3
commit 333d4168251abc5a7a64d500109e7dbad5a57bc3
Merge: 5830175 d0d45ee
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 24 09:14:41 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 24 09:14:41 2013 -0400

    Merge topic 'fix-OLD-CMP0021' into next
    
    d0d45ee Don't overwrite the header file for in-source builds.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0d45eefaef0a4151163457f7aa601482aaaec88
commit d0d45eefaef0a4151163457f7aa601482aaaec88
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 24 15:13:51 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 24 15:13:51 2013 +0200

    Don't overwrite the header file for in-source builds.

diff --git a/Tests/IncludeDirectories/CMP0021/CMakeLists.txt b/Tests/IncludeDirectories/CMP0021/CMakeLists.txt
index f449e90..0b9aee8 100644
--- a/Tests/IncludeDirectories/CMP0021/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMP0021/CMakeLists.txt
@@ -2,11 +2,13 @@
 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"
-)
+if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+  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"
+  )
+endif()
 set_property(TARGET cmp0021exe PROPERTY
   INCLUDE_DIRECTORIES includes/cmp0021)

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

Summary of changes:
 Tests/IncludeDirectories/CMP0021/CMakeLists.txt |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake