kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Need to collapse path argument to get_directory_property. This addresses bug#3847.

Browse Source
This commit is contained in:
Brad King 2006-10-16 15:18:03 -04:00
parent 49bf0b9e3d
commit 30235517f8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGetDirectoryPropertyCommand.cxx
View File

@ -53,6 +53,10 @@ bool cmGetDirectoryPropertyCommand::InitialPass(
sd += "/"; sd += "/";
sd += *i; sd += *i;
} }
// The local generators are associated with collapsed paths.
sd = cmSystemTools::CollapseFullPath(sd.c_str());
// lookup the makefile from the directory name // lookup the makefile from the directory name
cmLocalGenerator *lg = cmLocalGenerator *lg =
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()-> this->Makefile->GetLocalGenerator()->GetGlobalGenerator()->

4
Tests/OutOfSource/CMakeLists.txt
View File

@ -4,6 +4,10 @@ project (OutOfSource)
add_subdirectory(SubDir) add_subdirectory(SubDir)
get_directory_property(ANIMAL DIRECTORY OutOfSourceSubdir DEFINITION WEASELS) 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( configure_file(
${OutOfSource_SOURCE_DIR}/testdp.h.in ${OutOfSource_SOURCE_DIR}/testdp.h.in