kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Brad King 2006-03-16 17:09:08 -05:00
parent dbe7d39738
commit 1d38a3e09e
4 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmConfigure.cmake.h.in
View File

@ -11,8 +11,3 @@
#define CMake_VERSION_PATCH @CMake_VERSION_PATCH@ #define CMake_VERSION_PATCH @CMake_VERSION_PATCH@
#define CMAKE_DATA_DIR "@CMAKE_DATA_DIR@" #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@"

13
Source/cmDynamicLoader.cxx
View File

@ -115,16 +115,3 @@ void cmDynamicLoader::FlushCache()
{ {
cmDynamicLoaderCache::GetInstance()->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;
}

8
Source/cmDynamicLoader.h
View File

@ -36,14 +36,6 @@ public:
// the symbols in the library. // the symbols in the library.
static cmsys::DynamicLoader::LibraryHandle OpenLibrary(const char*); 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: // Description:
// Flush the cache of dynamic loader. // Flush the cache of dynamic loader.
static void FlushCache(); static void FlushCache();

17
Source/cmLoadCommandCommand.cxx
View File

@ -230,8 +230,11 @@ bool cmLoadCommandCommand::InitialPass(std::vector<std::string> const& args)
this->Makefile->RemoveDefinition(reportVar.c_str()); this->Makefile->RemoveDefinition(reportVar.c_str());
// the file must exist // the file must exist
std::string fullPath = cmDynamicLoader::LibPrefix(); std::string moduleName =
fullPath += "cm" + args[0] + cmDynamicLoader::LibExtension(); this->Makefile->GetRequiredDefinition("CMAKE_SHARED_MODULE_PREFIX");
moduleName += "cm" + args[0];
moduleName +=
this->Makefile->GetRequiredDefinition("CMAKE_SHARED_MODULE_SUFFIX");
// search for the file // search for the file
std::vector<std::string> path; std::vector<std::string> path;
@ -246,13 +249,13 @@ bool cmLoadCommandCommand::InitialPass(std::vector<std::string> const& args)
} }
// Try to find the program. // Try to find the program.
fullPath = cmSystemTools::FindFile(fullPath.c_str(), path); std::string fullPath = cmSystemTools::FindFile(moduleName.c_str(), path);
if (fullPath == "") if (fullPath == "")
{ {
fullPath = "Attempt to load command failed from file : "; cmOStringStream e;
fullPath += cmDynamicLoader::LibPrefix(); e << "Attempt to load command failed from file \""
fullPath += "cm" + args[0] + cmDynamicLoader::LibExtension(); << moduleName << "\"";
this->SetError(fullPath.c_str()); this->SetError(e.str().c_str());
return false; return false;
} }