mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 06:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

find_library: Infer library prefix and suffix when in script mode

Browse Source 
This aligns `find_library` with the documentation that states it
can be called from script mode. This is done by infering the
proper prefix and suffix values when `find_library` is called
when the `CMAKE_FIND_LIBRARY*` are not set. This also means that
`find_library` won't produce obscure error messages about unset
definitions.

Fixes: #22027
This commit is contained in:
Robert Maynard
2021-07-12 13:26:36 -04:00
committed by Brad King
parent a42b753c41
commit aa3ab3eb92
6 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Source/cmFindLibraryCommand.cxx
View File

@@ -259,6 +259,34 @@ struct cmFindLibraryHelper
};
};
namespace {
std::string const& get_prefixes(cmMakefile* mf)
{
#ifdef _WIN32
static std::string defaultPrefix = ";lib";
#else
static std::string defaultPrefix = "lib";
#endif
cmProp prefixProp = mf->GetDefinition("CMAKE_FIND_LIBRARY_PREFIXES");
return (prefixProp) ? *prefixProp : defaultPrefix;
}
std::string const& get_suffixes(cmMakefile* mf)
{
#ifdef _WIN32
static std::string defaultSuffix = ".lib;.dll.a;.a";
#elif defined(__APPLE__)
static std::string defaultSuffix = ".tbd;.dylib;.so;.a";
#elif defined(__hpux)
static std::string defaultSuffix = ".sl;.so;.a";
#else
static std::string defaultSuffix = ".so;.a";
#endif
cmProp suffixProp = mf->GetDefinition("CMAKE_FIND_LIBRARY_SUFFIXES");
return (suffixProp) ? *suffixProp : defaultSuffix;
}
}
cmFindLibraryHelper::cmFindLibraryHelper(std::string debugName, cmMakefile* mf,
cmFindBase const* base)
: Makefile(mf)
@@ -268,10 +296,9 @@ cmFindLibraryHelper::cmFindLibraryHelper(std::string debugName, cmMakefile* mf,
this->GG = this->Makefile->GetGlobalGenerator();
// Collect the list of library name prefixes/suffixes to try.
std::string const& prefixes_list =
this->Makefile->GetRequiredDefinition("CMAKE_FIND_LIBRARY_PREFIXES");
std::string const& suffixes_list =
this->Makefile->GetRequiredDefinition("CMAKE_FIND_LIBRARY_SUFFIXES");
std::string const& prefixes_list = get_prefixes(this->Makefile);
std::string const& suffixes_list = get_suffixes(this->Makefile);
cmExpandList(prefixes_list, this->Prefixes, true);
cmExpandList(suffixes_list, this->Suffixes, true);
this->RegexFromList(this->PrefixRegexStr, this->Prefixes);