From e2e0d2e3c7108d5ce41f032ad9089155c6b4735c Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 30 Jan 2013 14:44:49 -0500
Subject: ExternalData: Collapse ../ components in DATA{} paths

Relative path components need to be normalized out even if they appear
in the middle of a caller-supplied string.
---
 Modules/ExternalData.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Modules/ExternalData.cmake')

diff --git a/Modules/ExternalData.cmake b/Modules/ExternalData.cmake
index 26b0f99ab1..825b7b8716 100644
--- a/Modules/ExternalData.cmake
+++ b/Modules/ExternalData.cmake
@@ -334,8 +334,9 @@ function(_ExternalData_arg target arg options var_file)
   if(IS_ABSOLUTE "${data}")
     set(absdata "${data}")
   else()
-    get_filename_component(absdata "${CMAKE_CURRENT_SOURCE_DIR}/${data}" ABSOLUTE)
+    set(absdata "${CMAKE_CURRENT_SOURCE_DIR}/${data}")
   endif()
+  get_filename_component(absdata "${absdata}" ABSOLUTE)
 
   # Convert to relative path under the source tree.
   if(NOT ExternalData_SOURCE_ROOT)
-- 
cgit v1.2.1