From 30235517f81ed7ef8ff8e58685e786da472bf0d6 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 16 Oct 2006 15:18:03 -0400
Subject: BUG: Need to collapse path argument to get_directory_property.  This
 addresses bug#3847.

---
 Source/cmGetDirectoryPropertyCommand.cxx | 4 ++++
 Tests/OutOfSource/CMakeLists.txt         | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/Source/cmGetDirectoryPropertyCommand.cxx b/Source/cmGetDirectoryPropertyCommand.cxx
index 8d08c6b..278e2ae 100644
--- a/Source/cmGetDirectoryPropertyCommand.cxx
+++ b/Source/cmGetDirectoryPropertyCommand.cxx
@@ -53,6 +53,10 @@ bool cmGetDirectoryPropertyCommand::InitialPass(
       sd += "/";
       sd += *i;
       }
+
+    // The local generators are associated with collapsed paths.
+    sd = cmSystemTools::CollapseFullPath(sd.c_str());
+
     // lookup the makefile from the directory name
     cmLocalGenerator *lg = 
       this->Makefile->GetLocalGenerator()->GetGlobalGenerator()->
diff --git a/Tests/OutOfSource/CMakeLists.txt b/Tests/OutOfSource/CMakeLists.txt
index a053f14..265d47d 100644
--- a/Tests/OutOfSource/CMakeLists.txt
+++ b/Tests/OutOfSource/CMakeLists.txt
@@ -4,6 +4,10 @@ project (OutOfSource)
 add_subdirectory(SubDir)
 
 get_directory_property(ANIMAL DIRECTORY OutOfSourceSubdir DEFINITION WEASELS)
+get_directory_property(ANIMALREL DIRECTORY SubDir/../OutOfSourceSubdir DEFINITION WEASELS)
+IF(NOT "${ANIMAL}" STREQUAL "${ANIMALREL}")
+  MESSAGE(FATAL_ERROR "GET_DIRECTORY_PROPERTY does not seem to collapse paths.")
+ENDIF(NOT "${ANIMAL}" STREQUAL "${ANIMALREL}")
 
 configure_file(
   ${OutOfSource_SOURCE_DIR}/testdp.h.in
-- 
cgit v0.12