diff options
| author | Brad King <brad.king@kitware.com> | 2012-07-20 14:09:57 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-07-20 14:19:11 -0400 |
| commit | 733726edf61aa7889b57aa9490cb719c83d3ea0f (patch) | |
| tree | 7e757a1828ac7e9a936b1161aea7dcb70ba91680 /Source/cmFindLibraryCommand.h | |
| parent | 54add62f1b36ffc25f333762901e14b2def21db2 (diff) | |
| download | cmake-733726edf61aa7889b57aa9490cb719c83d3ea0f.tar.gz | |
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.
Diffstat (limited to 'Source/cmFindLibraryCommand.h')
| -rw-r--r-- | Source/cmFindLibraryCommand.h | 4 |
1 files changed, 4 insertions, 0 deletions
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: |