[Cmake-commits] CMake branch, next, updated. v2.8.3-1207-gb69caf5

[David Cole]

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  b69caf5b747d8c89d5bf65290a56c6dff9ffb7e3 (commit)
       via  262da91e26e7641192549028fee40b4c62e25266 (commit)
      from  bd7384eef62693134fcd3cf210fb405c39b9b530 (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=b69caf5b747d8c89d5bf65290a56c6dff9ffb7e3
commit b69caf5b747d8c89d5bf65290a56c6dff9ffb7e3
Merge: bd7384e 262da91
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Jan 5 11:34:19 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 5 11:34:19 2011 -0500

    Merge topic 'fix-11461-add-midl-vs10' into next
    
    262da91 Prohibit space in HOME value for VSMidl test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=262da91e26e7641192549028fee40b4c62e25266
commit 262da91e26e7641192549028fee40b4c62e25266
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Jan 5 11:30:12 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Jan 5 11:30:12 2011 -0500

    Prohibit space in HOME value for VSMidl test.
    
    Some Windows machines actually define HOME in their
    environment. And some of them actually put a directory
    with a space in the name as the value.
    
    Make sure the HOME value (CMake variable) in this CMakeLists
    file does not contain a space.

diff --git a/Tests/VSMidl/CMakeLists.txt b/Tests/VSMidl/CMakeLists.txt
index 7dd2b4d..432506c 100644
--- a/Tests/VSMidl/CMakeLists.txt
+++ b/Tests/VSMidl/CMakeLists.txt
@@ -27,12 +27,15 @@ if(NOT DEFINED HOME)
   if(NOT HOME AND WIN32)
     # Try for USERPROFILE as HOME equivalent:
     string(REPLACE "\\" "/" HOME "$ENV{USERPROFILE}")
+  endif()
 
-    # But just use root of SystemDrive if USERPROFILE contains any spaces:
-    # (Default on XP and earlier...)
-    if(HOME MATCHES " ")
-      string(REPLACE "\\" "/" HOME "$ENV{SystemDrive}")
-    endif()
+  # But just use root of SystemDrive if HOME contains any spaces:
+  # (Default on XP and earlier...)
+  if(HOME MATCHES " " AND WIN32)
+    string(REPLACE "\\" "/" HOME "$ENV{SystemDrive}")
+  endif()
+  if(HOME MATCHES " ")
+    set(HOME "")
   endif()
 endif()
 message(STATUS "HOME='${HOME}'")

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

Summary of changes:
 Tests/VSMidl/CMakeLists.txt |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake