diff options
| author | Brad King <brad.king@kitware.com> | 2007-06-27 16:07:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-06-27 16:07:34 (GMT) |
| commit | eab81489f10049fc1e97f65779adbca160fccf16 (patch) | |
| tree | eb40ef1065176de3b83865b9d0f0d3d8b4701a1c /Source/cmFindLibraryCommand.cxx | |
| parent | 6352bd5cd34be913415303f078cd02b32b1b4e41 (diff) | |
| download | CMake-eab81489f10049fc1e97f65779adbca160fccf16.zip CMake-eab81489f10049fc1e97f65779adbca160fccf16.tar.gz CMake-eab81489f10049fc1e97f65779adbca160fccf16.tar.bz2 | |
ENH: Added global property FIND_LIBRARY_USE_LIB64_PATHS to allow lib64 paths to be searched optionally. Turn off the feature on debian systems. This addresses debian report 419007.
Diffstat (limited to 'Source/cmFindLibraryCommand.cxx')
| -rw-r--r-- | Source/cmFindLibraryCommand.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx index c57e8d8..5fcf089 100644 --- a/Source/cmFindLibraryCommand.cxx +++ b/Source/cmFindLibraryCommand.cxx @@ -67,8 +67,14 @@ bool cmFindLibraryCommand::InitialPass(std::vector<std::string> const& argsIn) } return true; } - // add special 64 bit paths if this is a 64 bit compile. - this->AddLib64Paths(); + + if(this->Makefile->GetCMakeInstance() + ->GetPropertyAsBool("FIND_LIBRARY_USE_LIB64_PATHS")) + { + // add special 64 bit paths if this is a 64 bit compile. + this->AddLib64Paths(); + } + std::string library; for(std::vector<std::string>::iterator i = this->Names.begin(); i != this->Names.end() ; ++i) |