[Cmake-commits] CMake branch, next, updated. v3.0.2-5724-g518da4e

[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  518da4e347480400e1630aa22f58be67a14c82bd (commit)
       via  b93b1cdf6552701e854867f894f0740608aa4172 (commit)
      from  5ff1a1b4afa80fde4583427f4fdfa9e70233d349 (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=518da4e347480400e1630aa22f58be67a14c82bd
commit 518da4e347480400e1630aa22f58be67a14c82bd
Merge: 5ff1a1b b93b1cd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Oct 11 09:23:23 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 11 09:23:23 2014 -0400

    Merge topic 'fix-ninja-rc-include-flags' into next
    
    b93b1cdf Tests/VSResource: Fix test case added by parent


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b93b1cdf6552701e854867f894f0740608aa4172
commit b93b1cdf6552701e854867f894f0740608aa4172
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Oct 11 09:22:33 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Oct 11 09:22:33 2014 -0400

    Tests/VSResource: Fix test case added by parent
    
    Add the include directory everywhere we perform the include.

diff --git a/Tests/VSResource/CMakeLists.txt b/Tests/VSResource/CMakeLists.txt
index 67c5a36..17eb041 100644
--- a/Tests/VSResource/CMakeLists.txt
+++ b/Tests/VSResource/CMakeLists.txt
@@ -18,6 +18,11 @@ if(CMAKE_RC_COMPILER MATCHES windres)
   message(STATUS "CMAKE_RC_COMPILER MATCHES windres")
   add_definitions(/DCMAKE_RCDEFINE=test.txt)
   add_definitions(/DCMAKE_RCDEFINE_NO_QUOTED_STRINGS)
+  if(MSYS AND CMAKE_CURRENT_BINARY_DIR MATCHES " ")
+    # windres cannot handle spaces in include dir, and
+    # for the MSys shell we do not convert to shortpath.
+    set(CMAKE_RC_NO_INCLUDE 1)
+  endif()
 elseif(MSVC60)
   # VS6 rc compiler does not deal well with spaces in a "/D" value, but it can
   # handle the quoting
@@ -30,10 +35,15 @@ else()
   set(TEXTFILE_FROM_SOURCE_DIR "textfile, spaces in name, from binary dir")
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test.txt
     "${CMAKE_CURRENT_BINARY_DIR}/test with spaces.txt" @ONLY)
+  add_definitions(/DCMAKE_RCDEFINE="test with spaces.txt")
+endif()
+
+if(CMAKE_RC_NO_INCLUDE)
+  add_definitions(/DCMAKE_RC_NO_INCLUDE)
+else()
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include.rc.in
     "${CMAKE_CURRENT_BINARY_DIR}/include.rc" @ONLY)
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
-  add_definitions(/DCMAKE_RCDEFINE="test with spaces.txt")
 endif()
 
 add_executable(VSResource main.cpp test.rc)
diff --git a/Tests/VSResource/test.rc b/Tests/VSResource/test.rc
index c6a54c7..0de4683 100644
--- a/Tests/VSResource/test.rc
+++ b/Tests/VSResource/test.rc
@@ -1,5 +1,7 @@
 #ifdef CMAKE_RCDEFINE
-# include <include.rc>
+# ifndef CMAKE_RC_NO_INCLUDE
+#  include <include.rc>
+# endif
 
 // This line can compile with either an unquoted or a quoted string
 1025 TEXTFILE CMAKE_RCDEFINE

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

Summary of changes:
 Tests/VSResource/CMakeLists.txt |   12 +++++++++++-
 Tests/VSResource/test.rc        |    4 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake