From 733726edf61aa7889b57aa9490cb719c83d3ea0f Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 20 Jul 2012 14:09:57 -0400 Subject: find_library: Fix mixed lib->lib64 (non-)conversion cases (#13419) When a search path contains multiple "lib/" instances we previously converted all or none. This fails for cases where only some of the multiple instances must be converted. Teach AddArchitecturePaths to generate all combinations that exist. Uncomment these cases in the CMakeOnly.find_library test now that they work. --- Source/cmFindLibraryCommand.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Source/cmFindLibraryCommand.h') diff --git a/Source/cmFindLibraryCommand.h b/Source/cmFindLibraryCommand.h index f91583bf5d..31a5c3f8df 100644 --- a/Source/cmFindLibraryCommand.h +++ b/Source/cmFindLibraryCommand.h @@ -62,6 +62,10 @@ public: protected: void AddArchitecturePaths(const char* suffix); + void AddArchitecturePath(std::string const& dir, + std::string::size_type start_pos, + const char* suffix, + bool fresh = true); std::string FindLibrary(); virtual void GenerateDocumentation(); private: -- cgit v1.2.1