BUG: Removed compiled-in CMAKE_SHARED_MODULE_PREFIX and CMAKE_SHARED_MODULE_SUFFIX for loaded commands in favor of using the settings from the platform files.
This commit is contained in:
parent
dbe7d39738
commit
1d38a3e09e
|
@ -11,8 +11,3 @@
|
|||
#define CMake_VERSION_PATCH @CMake_VERSION_PATCH@
|
||||
|
||||
#define CMAKE_DATA_DIR "@CMAKE_DATA_DIR@"
|
||||
|
||||
#define CMAKE_SHARED_LIBRARY_PREFIX "@CMAKE_SHARED_LIBRARY_PREFIX@"
|
||||
#define CMAKE_SHARED_MODULE_PREFIX "@CMAKE_SHARED_MODULE_PREFIX@"
|
||||
#define CMAKE_SHARED_LIBRARY_SUFFIX "@CMAKE_SHARED_LIBRARY_SUFFIX@"
|
||||
#define CMAKE_SHARED_MODULE_SUFFIX "@CMAKE_SHARED_MODULE_SUFFIX@"
|
||||
|
|
|
@ -115,16 +115,3 @@ void cmDynamicLoader::FlushCache()
|
|||
{
|
||||
cmDynamicLoaderCache::GetInstance()->FlushCache();
|
||||
}
|
||||
|
||||
// Stay consistent with the Modules/Platform directory as
|
||||
// to what the correct prefix and lib extension
|
||||
const char* cmDynamicLoader::LibPrefix()
|
||||
{
|
||||
return CMAKE_SHARED_MODULE_PREFIX;
|
||||
}
|
||||
|
||||
const char* cmDynamicLoader::LibExtension()
|
||||
{
|
||||
return CMAKE_SHARED_MODULE_SUFFIX;
|
||||
}
|
||||
|
||||
|
|
|
@ -36,14 +36,6 @@ public:
|
|||
// the symbols in the library.
|
||||
static cmsys::DynamicLoader::LibraryHandle OpenLibrary(const char*);
|
||||
|
||||
// Description:
|
||||
// Return the library prefix for the given architecture
|
||||
static const char* LibPrefix();
|
||||
|
||||
// Description:
|
||||
// Return the library extension for the given architecture
|
||||
static const char* LibExtension();
|
||||
|
||||
// Description:
|
||||
// Flush the cache of dynamic loader.
|
||||
static void FlushCache();
|
||||
|
|
|
@ -230,8 +230,11 @@ bool cmLoadCommandCommand::InitialPass(std::vector<std::string> const& args)
|
|||
this->Makefile->RemoveDefinition(reportVar.c_str());
|
||||
|
||||
// the file must exist
|
||||
std::string fullPath = cmDynamicLoader::LibPrefix();
|
||||
fullPath += "cm" + args[0] + cmDynamicLoader::LibExtension();
|
||||
std::string moduleName =
|
||||
this->Makefile->GetRequiredDefinition("CMAKE_SHARED_MODULE_PREFIX");
|
||||
moduleName += "cm" + args[0];
|
||||
moduleName +=
|
||||
this->Makefile->GetRequiredDefinition("CMAKE_SHARED_MODULE_SUFFIX");
|
||||
|
||||
// search for the file
|
||||
std::vector<std::string> path;
|
||||
|
@ -246,13 +249,13 @@ bool cmLoadCommandCommand::InitialPass(std::vector<std::string> const& args)
|
|||
}
|
||||
|
||||
// Try to find the program.
|
||||
fullPath = cmSystemTools::FindFile(fullPath.c_str(), path);
|
||||
std::string fullPath = cmSystemTools::FindFile(moduleName.c_str(), path);
|
||||
if (fullPath == "")
|
||||
{
|
||||
fullPath = "Attempt to load command failed from file : ";
|
||||
fullPath += cmDynamicLoader::LibPrefix();
|
||||
fullPath += "cm" + args[0] + cmDynamicLoader::LibExtension();
|
||||
this->SetError(fullPath.c_str());
|
||||
cmOStringStream e;
|
||||
e << "Attempt to load command failed from file \""
|
||||
<< moduleName << "\"";
|
||||
this->SetError(e.str().c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue