diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-12-07 04:05:10 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-12-07 04:05:10 (GMT) |
| commit | 26b527ac0fd63d2a86d3552122bd44a5b32d6adb (patch) | |
| tree | 1d512054b9db82a4dd45aa839faf29fd737f6ae0 /Source | |
| parent | a44ac0719ca0919aec649fec7a9b8e592b925b0b (diff) | |
| download | CMake-26b527ac0fd63d2a86d3552122bd44a5b32d6adb.zip CMake-26b527ac0fd63d2a86d3552122bd44a5b32d6adb.tar.gz CMake-26b527ac0fd63d2a86d3552122bd44a5b32d6adb.tar.bz2 | |
ENH: fix bug in full path to target depends stuff
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 9896b17..5311c72 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -410,16 +410,17 @@ IF(BUILD_TESTING) --test-command ${CMAKE_CMAKE_COMMAND} -E compare_files ${CMake_SOURCE_DIR}/Tests/TargetName/scripts/hello_world ${CMake_BINARY_DIR}/Tests/TargetName/scripts/hello_world) - ADD_TEST(LibName ${CMAKE_CTEST_COMMAND} + + ADD_TEST(CustComDepend ${CMAKE_CTEST_COMMAND} --build-and-test - "${CMake_SOURCE_DIR}/Tests/LibName" - "${CMake_BINARY_DIR}/Tests/LibName" + "${CMake_SOURCE_DIR}/Tests/CustComDepend" + "${CMake_BINARY_DIR}/Tests/CustComDepend" --build-two-config --build-generator ${CMAKE_TEST_GENERATOR} --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} - --build-project LibName - --build-exe-dir "${CMake_BINARY_DIR}/Tests/LibName/lib" - --test-command foobar + --build-project CustComDepend + --build-exe-dir "${CMake_BINARY_DIR}/Tests/CustComDepend/bin" + --test-command foo bar.c ) ADD_TEST(CustomCommand ${CMAKE_CTEST_COMMAND} diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 398093d..d437899 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1863,6 +1863,8 @@ std::string cmLocalGenerator::GetRealDependency(const char* inName, tLocation = cmSystemTools::GetFilenamePath(tLocation); std::string depLocation = cmSystemTools::GetFilenamePath( std::string(inName)); + depLocation = cmSystemTools::CollapseFullPath(depLocation.c_str()); + tLocation = cmSystemTools::CollapseFullPath(tLocation.c_str()); if(depLocation != tLocation) { // it is a full path to a depend that has the same name diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 0dc8bd9..0b6f21d 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -253,6 +253,8 @@ void cmTarget::TraceVSDependencies(std::string projFile, tLocation = cmSystemTools::GetFilenamePath(tLocation); std::string depLocation = cmSystemTools::GetFilenamePath( std::string(fullName)); + depLocation = cmSystemTools::CollapseFullPath(depLocation.c_str()); + tLocation = cmSystemTools::CollapseFullPath(tLocation.c_str()); if(depLocation == tLocation) { isUtility = true; |