[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3595-g3ab506b

[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  3ab506b5cb2fcc0c23d94e7c42ff21948474947f (commit)
       via  91717fa5b43ec07e3846ef586e07eb1eb43041fe (commit)
      from  4aa8ef8145d770775797b81ff7d3177f2a97cf25 (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=3ab506b5cb2fcc0c23d94e7c42ff21948474947f
commit 3ab506b5cb2fcc0c23d94e7c42ff21948474947f
Merge: 4aa8ef8 91717fa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 6 09:38:57 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 6 09:38:57 2014 -0400

    Merge topic 'dev/fix-externaldata-with-symlink-in-source-path' into next
    
    91717fa5 Revert "ExternalData: determine the data path properly"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91717fa5b43ec07e3846ef586e07eb1eb43041fe
commit 91717fa5b43ec07e3846ef586e07eb1eb43041fe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 6 09:39:21 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 6 09:39:21 2014 -0400

    Revert "ExternalData: determine the data path properly"
    
    This reverts commit 8a3c081b94ea72bef9a7afb58937e9a4f1fa4b5c.
    The case where this fails will have other problems outside
    of ExternalData.  We need to fix this in CheckTranslationPath
    instead.

diff --git a/Modules/ExternalData.cmake b/Modules/ExternalData.cmake
index d031e07..73a4990 100644
--- a/Modules/ExternalData.cmake
+++ b/Modules/ExternalData.cmake
@@ -383,10 +383,7 @@ function(_ExternalData_arg target arg options var_file)
   else()
     set(absdata "${CMAKE_CURRENT_SOURCE_DIR}/${data}")
   endif()
-  get_filename_component(absdir "${absdata}" DIRECTORY)
-  get_filename_component(absdir "${absdir}" REALPATH)
-  get_filename_component(absname "${absdata}" NAME)
-  set(absdata "${absdir}/${absname}")
+  get_filename_component(absdata "${absdata}" ABSOLUTE)
 
   # Convert to relative path under the source tree.
   if(NOT ExternalData_SOURCE_ROOT)

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

Summary of changes:
 Modules/ExternalData.cmake |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)


hooks/post-receive
-- 
CMake