diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-13 17:26:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-13 17:26:57 (GMT) |
| commit | 85f843a7b4aaf1b25e1e1e60ecdae3a3e2d7a9cb (patch) | |
| tree | f25dae6a02680f4659322e65a54e5b421d900aea /Source/cmFindLibraryCommand.h | |
| parent | e93d9c5c2b8095cf94ebb92763604db0108e0818 (diff) | |
| parent | af80da349bb259ccccac146cdd734afeedeec116 (diff) | |
| download | CMake-85f843a7b4aaf1b25e1e1e60ecdae3a3e2d7a9cb.zip CMake-85f843a7b4aaf1b25e1e1e60ecdae3a3e2d7a9cb.tar.gz CMake-85f843a7b4aaf1b25e1e1e60ecdae3a3e2d7a9cb.tar.bz2 | |
Merge topic 'mixed-lib-to-lib64'
af80da3 remove lib64 Unix paths if the respective lib path is also given
733726e find_library: Fix mixed lib->lib64 (non-)conversion cases (#13419)
54add62 find_library: Simplify lib->lib<arch> expansion
6ca2f82 find_library: Refactor lib->lib64 conversion
1fe4b82 find_library: Add test covering lib->lib64 cases
Diffstat (limited to 'Source/cmFindLibraryCommand.h')
| -rw-r--r-- | Source/cmFindLibraryCommand.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmFindLibraryCommand.h b/Source/cmFindLibraryCommand.h index b880be2..31a5c3f 100644 --- a/Source/cmFindLibraryCommand.h +++ b/Source/cmFindLibraryCommand.h @@ -62,7 +62,10 @@ public: protected: void AddArchitecturePaths(const char* suffix); - void AddLib64Paths(); + 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: |