[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5432-gfe0a38b

[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  fe0a38bab4ffbab4f713436a23e390a4687289ca (commit)
       via  a45a745a9eda4bed60eb63cfbc832e44e6e3673f (commit)
      from  b9e18c73bf9229fe491d989a2efc7132da33fbe8 (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=fe0a38bab4ffbab4f713436a23e390a4687289ca
commit fe0a38bab4ffbab4f713436a23e390a4687289ca
Merge: b9e18c7 a45a745
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 13:55:34 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 13:55:34 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    a45a745 Exclude the test of non-rerooting of the staging prefix on WIN32.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a45a745a9eda4bed60eb63cfbc832e44e6e3673f
commit a45a745a9eda4bed60eb63cfbc832e44e6e3673f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 19:54:43 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 19 19:54:43 2013 +0100

    Exclude the test of non-rerooting of the staging prefix on WIN32.

diff --git a/Tests/StagingPrefix/CMakeLists.txt b/Tests/StagingPrefix/CMakeLists.txt
index 92e52b3..751fde5 100644
--- a/Tests/StagingPrefix/CMakeLists.txt
+++ b/Tests/StagingPrefix/CMakeLists.txt
@@ -67,10 +67,12 @@ set_property(
 
 write_make_script(Consumer)
 
-file(WRITE
-  "${CMAKE_BINARY_DIR}/ignored/${CMAKE_BINARY_DIR}/stage/include/ignored.h"
-  "#define IGNORED\n"
-)
+if(NOT WIN32)
+  file(WRITE
+    "${CMAKE_BINARY_DIR}/ignored/${CMAKE_BINARY_DIR}/stage/include/ignored.h"
+    "#define IGNORED\n"
+  )
+endif()
 
 # Build and install the consumer.
 add_custom_command(
diff --git a/Tests/StagingPrefix/Consumer/CMakeLists.txt b/Tests/StagingPrefix/Consumer/CMakeLists.txt
index cb8d649..a230441 100644
--- a/Tests/StagingPrefix/Consumer/CMakeLists.txt
+++ b/Tests/StagingPrefix/Consumer/CMakeLists.txt
@@ -14,7 +14,9 @@ target_link_libraries(executable ${Bar_LIBRARIES})
 
 install(TARGETS executable DESTINATION bin)
 
-find_path(IGNORED_INCLUDE_DIR ignored.h)
-if (IGNORED_INCLUDE_DIR)
-  message(SEND_ERROR "Should not find this file. The search path should be excluded.")
+if(NOT WIN32)
+  find_path(IGNORED_INCLUDE_DIR ignored.h)
+  if (IGNORED_INCLUDE_DIR)
+    message(SEND_ERROR "Should not find this file. The search path should be excluded.")
+  endif()
 endif()

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

Summary of changes:
 Tests/StagingPrefix/CMakeLists.txt          |   10 ++++++----
 Tests/StagingPrefix/Consumer/CMakeLists.txt |    8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake