[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5142-g4e418e6

[Clinton Stimpson]

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  4e418e67b774f97edbe1486d7d40e1fabdcf66bd (commit)
       via  d56f13daa3f9c79e6c43d385998802b4a1aa8d8c (commit)
       via  8b86afc6d93d14b05273b06fc44f83716a89eaf3 (commit)
      from  4bf98844a6ec2ec741d5cf2f5ad4162974bd1e1f (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=4e418e67b774f97edbe1486d7d40e1fabdcf66bd
commit 4e418e67b774f97edbe1486d7d40e1fabdcf66bd
Merge: 4bf9884 d56f13d
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Nov 13 18:39:23 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 13 18:39:23 2013 -0500

    Merge topic 'gp-ld_library_path' into next
    
    d56f13d GetPrerequisites:  Preserve search path order from caller.
    8b86afc Merge topic 'cmake-distribution-config'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d56f13daa3f9c79e6c43d385998802b4a1aa8d8c
commit d56f13daa3f9c79e6c43d385998802b4a1aa8d8c
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Nov 13 16:38:08 2013 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Nov 13 16:38:08 2013 -0700

    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()
 
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b86afc6d93d14b05273b06fc44f83716a89eaf3
commit 8b86afc6d93d14b05273b06fc44f83716a89eaf3
Merge: 558a6f1 06b0dbe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 13 11:36:46 2013 -0500
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Nov 13 16:37:58 2013 -0700

    Merge topic 'cmake-distribution-config'
    
    06b0dbe OS X: Drop version number from CMake.app bundle name (#11693)
    84af42b Configure NSIS-packaged CMake version and install destination
    7655029 Configure NSIS-packaged CMake documentation link in Start Menu

diff --cc Source/QtDialog/CMakeLists.txt
index ee0b831,b17e212..f1f4649
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@@ -111,11 -111,8 +111,11 @@@ if(Qt_BIN_DIR
  endif()
  
  if(APPLE)
 +  file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
 +    LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
 +
    set_target_properties(cmake-gui PROPERTIES
-     OUTPUT_NAME ${CMAKE_BUNDLE_NAME}
+     OUTPUT_NAME CMake
      MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
      MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_BUNDLE_VERSION}"
      # TBD: MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_BUNDLE_VERSION}"

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

Summary of changes:
 Modules/GetPrerequisites.cmake |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake