[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5414-g221497e

[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  221497e57706e7b312f194eb3a1b21005fa5f47b (commit)
       via  eeef782e94c9c0d7e66bd38e5eddb495967fb944 (commit)
      from  b2f810b02185cfa2e3ecf262c02c88a2831d76d8 (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=221497e57706e7b312f194eb3a1b21005fa5f47b
commit 221497e57706e7b312f194eb3a1b21005fa5f47b
Merge: b2f810b eeef782
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 13:11:49 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 13:11:49 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    eeef782 Make use of the staging prefix conditional on it being set.


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

    Make use of the staging prefix conditional on it being set.

diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index 99e700e..eca3280 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -42,9 +42,13 @@ if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
   list(APPEND CMAKE_SYSTEM_PREFIX_PATH
     # Project install destination.
     "${CMAKE_INSTALL_PREFIX}"
-    # User-supplied staging prefix.
-    "${CMAKE_STAGING_PREFIX}"
   )
+  if(CMAKE_STAGING_PREFIX)
+    list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+      # User-supplied staging prefix.
+      "${CMAKE_STAGING_PREFIX}"
+    )
+  endif()
 endif()
 
 # List common include file locations not under the common prefixes.
diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake
index a521f89..3240c23 100644
--- a/Modules/Platform/WindowsPaths.cmake
+++ b/Modules/Platform/WindowsPaths.cmake
@@ -78,9 +78,13 @@ if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
   list(APPEND CMAKE_SYSTEM_PREFIX_PATH
     # Project install destination.
     "${CMAKE_INSTALL_PREFIX}"
-    # User-supplied staging prefix.
-    "${CMAKE_STAGING_PREFIX}"
     )
+  if (CMAKE_STAGING_PREFIX)
+    list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+      # User-supplied staging prefix.
+      "${CMAKE_STAGING_PREFIX}"
+    )
+  endif()
 endif()
 
 if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
@@ -95,8 +99,12 @@ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
 if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
   list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
     "${CMAKE_INSTALL_PREFIX}/bin"
-    "${CMAKE_STAGING_PREFIX}/bin"
   )
+  if (CMAKE_STAGING_PREFIX)
+    list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+      "${CMAKE_STAGING_PREFIX}/bin"
+    )
+  endif()
 endif()
 list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
   "${_CMAKE_INSTALL_DIR}/bin"

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

Summary of changes:
 Modules/Platform/UnixPaths.cmake    |    8 ++++++--
 Modules/Platform/WindowsPaths.cmake |   14 +++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake