[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2827-g0492593

[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  0492593faa913c4aa36b6cce39c40d7c46104c0c (commit)
       via  f9eee7f1833856f690b4a8ef5f5aa44d9ccb8114 (commit)
       via  90bd16419343ada9f026ce8387fafff9c3546a10 (commit)
       via  2baf851c34357cbb752bb91b99b835d3847b23a1 (commit)
       via  e55b8ce4a4f5d6a935fe82d600637c79e64e8cbd (commit)
       via  d37fe5bc5b328fae6b03af033ba69651f045df80 (commit)
       via  50e96802d2ad81f69d72dc87de80eee74d7a8dc9 (commit)
       via  e6c3595fde100b62f021ddb253b81fe3ecc9328b (commit)
      from  4cf05ba7c48f69beff60ee682d0cd52008e65e32 (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=0492593faa913c4aa36b6cce39c40d7c46104c0c
commit 0492593faa913c4aa36b6cce39c40d7c46104c0c
Merge: 4cf05ba f9eee7f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 25 09:19:51 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 25 09:19:51 2013 -0400

    Merge topic 'WindowsPaths-MinGW-cross-compile-only' into next
    
    f9eee7f Windows: Search '/' prefix only when cross compiling (#10994)
    90bd164 CMake Nightly Date Stamp
    2baf851 CMake Nightly Date Stamp
    e55b8ce CMake Nightly Date Stamp
    d37fe5b CMake Nightly Date Stamp
    50e9680 CMake Nightly Date Stamp
    e6c3595 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9eee7f1833856f690b4a8ef5f5aa44d9ccb8114
commit f9eee7f1833856f690b4a8ef5f5aa44d9ccb8114
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 25 09:07:45 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 25 09:07:45 2013 -0400

    Windows: Search '/' prefix only when cross compiling (#10994)
    
    Commit dac78148 (...makes the mingw cross compiler work out of the
    box..., 2007-08-02) added to CMAKE_SYSTEM_PROGRAM_PATH and
    CMAKE_SYSTEM_LIBRARY_PATH paths like "/bin" and "/lib" with no Windows
    drive letter so that cross-compiling to Windows from Linux would search
    these paths under CMAKE_FIND_ROOT_PATH.  Later commit 2a782880 (...use
    CMAKE_SYSTEM_PREFIX_PATH when possible, 2008-01-16) generalized this
    approach by instead adding "/" to CMAKE_SYSTEM_PREFIX_PATH.
    
    Both commits assumed that the paths would never match anything on
    Windows hosts without a drive letter.  However, Windows evaluates these
    paths relative to the current working drive letter so find_* commands
    may report paths like "/lib/..." when paths like "c:/lib/..." exist on
    what happens to be current drive.  Such drive-less paths are not
    reliable when the working drive changes, so we should not use them.
    
    Fix WindowsPaths.cmake to add '/' to CMAKE_SYSTEM_PREFIX_PATH only when
    cross-compiling to Windows from a non-Windows host.  This will avoid
    searching and finding local paths without a drive letter on Windows.

diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake
index bd31da0..fc921d7 100644
--- a/Modules/Platform/WindowsPaths.cmake
+++ b/Modules/Platform/WindowsPaths.cmake
@@ -77,10 +77,12 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH "${_CMAKE_INSTALL_DIR}")
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH
   # Project install destination.
   "${CMAKE_INSTALL_PREFIX}"
+  )
 
+if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
   # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
-  /
-  )
+  list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
+endif()
 
 list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
   )

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

Summary of changes:
 Modules/Platform/WindowsPaths.cmake |    6 ++++--
 Source/CMakeVersion.cmake           |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake