From 5fd54d79466f737409763f1c888abc23d50ade9d Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 23 Sep 2008 13:34:23 -0400 Subject: [PATCH] BUG: Fix lib/ to lib/64/ search path conversion Automatic generation of 64-bit library search paths must preserve trailing slashes. This fixes a failure case exposed by the recent rewrite of find_library, which assumes trailing slashes occur on all search paths. --- Source/cmFindLibraryCommand.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx index b81a5bfe1..78244cef7 100644 --- a/Source/cmFindLibraryCommand.cxx +++ b/Source/cmFindLibraryCommand.cxx @@ -182,6 +182,7 @@ void cmFindLibraryCommand::AddLib64Paths() cmSystemTools::ReplaceString(s, "lib/", "lib64/"); // try to replace lib with lib64 and see if it is there, // then prepend it to the path + // Note that all paths have trailing slashes. if((s != *i) && cmSystemTools::FileIsDirectory(s.c_str())) { path64.push_back(s); @@ -189,7 +190,7 @@ void cmFindLibraryCommand::AddLib64Paths() } // now just add a 64 to the path name and if it is there, // add it to the path - s2 += "64"; + s2 += "64/"; if(cmSystemTools::FileIsDirectory(s2.c_str())) { found64 = true;