summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2004-02-16 14:50:06 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2004-02-16 14:50:06 (GMT)
commit07b4d8bbca2ad9d4826d9d37b1ef9b19b6489879 (patch)
treebc9be1db0927c6fee5441e94e2b6843067d1c8cf
parenta46e0d34760d980e7a6e26ad9a4f329d9d3475ba (diff)
downloadCMake-07b4d8bbca2ad9d4826d9d37b1ef9b19b6489879.zip
CMake-07b4d8bbca2ad9d4826d9d37b1ef9b19b6489879.tar.gz
CMake-07b4d8bbca2ad9d4826d9d37b1ef9b19b6489879.tar.bz2
BUG: fix mingw module load tests
-rw-r--r--Modules/Platform/Windows-gcc.cmake1
-rw-r--r--Source/cmDynamicLoader.cxx4
2 files changed, 4 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-gcc.cmake b/Modules/Platform/Windows-gcc.cmake
index d12378f..c38df85 100644
--- a/Modules/Platform/Windows-gcc.cmake
+++ b/Modules/Platform/Windows-gcc.cmake
@@ -3,7 +3,6 @@ SET(CMAKE_STATIC_LIBRARY_PREFIX "lib")
SET(CMAKE_STATIC_LIBRARY_SUFFIX ".a")
SET(CMAKE_SHARED_LIBRARY_PREFIX "lib") # lib
SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dll") # .so
-SET(CMAKE_SHARED_MODULE_PREFIX "")
SET(CMAKE_DL_LIBS "")
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "") # -pic
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") # -shared
diff --git a/Source/cmDynamicLoader.cxx b/Source/cmDynamicLoader.cxx
index 8a93610..9f91dd8 100644
--- a/Source/cmDynamicLoader.cxx
+++ b/Source/cmDynamicLoader.cxx
@@ -274,7 +274,11 @@ cmDynamicLoader::GetSymbolAddress(cmLibHandle lib, const char* sym)
const char* cmDynamicLoader::LibPrefix()
{
+#if defined( __MINGW32__ )
+ return "lib";
+#else
return "";
+#endif
}
const char* cmDynamicLoader::LibExtension()