[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3590-g17ae4b5

[Ben Boeckel]

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  17ae4b589e7d71f80d2c84616c4e7a3888c4e98b (commit)
       via  8a3c081b94ea72bef9a7afb58937e9a4f1fa4b5c (commit)
      from  537384eef1a6f02f557004992fd3f40c834ddbd5 (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=17ae4b589e7d71f80d2c84616c4e7a3888c4e98b
commit 17ae4b589e7d71f80d2c84616c4e7a3888c4e98b
Merge: 537384e 8a3c081
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jun 5 16:30:52 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 5 16:30:52 2014 -0400

    Merge topic 'dev/fix-externaldata-with-symlink-in-source-path' into next
    
    8a3c081b ExternalData: determine the data path properly


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a3c081b94ea72bef9a7afb58937e9a4f1fa4b5c
commit 8a3c081b94ea72bef9a7afb58937e9a4f1fa4b5c
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jun 5 16:28:53 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Jun 5 16:28:53 2014 -0400

    ExternalData: determine the data path properly
    
    The data file itself does not exist, so REALPATH does not work. Instead,
    split it into a directory and name, REALPATH the directory, then put it
    back together. Just using ABSOLUTE does not work because
    CMAKE_SOURCE_DIR uses REALPATH while ${project}_SOURCE_DIR uses
    ABSOLUTE. If these are not the same, the out-of-source DATA file
    detection gives a false-alarm.

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

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

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


hooks/post-receive
-- 
CMake