[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5150-g0c50e91

[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  0c50e914b35207ed0e76f186b8d89315ece0d27a (commit)
       via  e130b9ebaab1ed620d5d0fc0cac2b84eb527129b (commit)
      from  414b9154d15ca0e58bd522c7900795d15d065c0c (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=0c50e914b35207ed0e76f186b8d89315ece0d27a
commit 0c50e914b35207ed0e76f186b8d89315ece0d27a
Merge: 414b915 e130b9e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 14 11:27:08 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 14 11:27:08 2013 -0500

    Merge topic 'gp-ld_library_path' into next
    
    e130b9e GetPrerequisites:  Preserve search path order from caller.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e130b9ebaab1ed620d5d0fc0cac2b84eb527129b
commit e130b9ebaab1ed620d5d0fc0cac2b84eb527129b
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Nov 13 16:38:08 2013 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 14 11:26:23 2013 -0500

    GetPrerequisites:  Preserve search path order from caller.

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index bd899e2..ac649e9 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -738,9 +738,11 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
 
   if("${gp_tool}" STREQUAL "ldd")
     set(old_ld_env "$ENV{LD_LIBRARY_PATH}")
-    foreach(dir ${exepath} ${dirs})
-      set(ENV{LD_LIBRARY_PATH} "${dir}:$ENV{LD_LIBRARY_PATH}")
+    set(new_ld_env "${exepath}")
+    foreach(dir ${dirs})
+      set(new_ld_env "${new_ld_env}:${dir}")
     endforeach()
+    set(ENV{LD_LIBRARY_PATH} "${new_ld_env}:$ENV{LD_LIBRARY_PATH}")
   endif()
 
 

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

Summary of changes:


hooks/post-receive
-- 
CMake