瀏覽代碼

ENH: change mingw to use libfoo.dll instead of foo.dll since it can link to them

Bill Hoffman 22 年之前
父節點
當前提交
f7ce654912
共有 2 個文件被更改,包括 1 次插入9 次删除
  1. 1 1
      Modules/Platform/Windows-gcc.cmake
  2. 0 8
      Source/kwsys/SystemTools.cxx

+ 1 - 1
Modules/Platform/Windows-gcc.cmake

@@ -1,7 +1,7 @@
 SET(CMAKE_LINK_LIBRARY_SUFFIX "")  
 SET(CMAKE_STATIC_LIBRARY_PREFIX "lib")
 SET(CMAKE_STATIC_LIBRARY_SUFFIX ".a")
-SET(CMAKE_SHARED_LIBRARY_PREFIX "")          # lib
+SET(CMAKE_SHARED_LIBRARY_PREFIX "lib")          # lib
 SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dll")          # .so
 SET(CMAKE_DL_LIBS "")
 SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")            # -pic 

+ 0 - 8
Source/kwsys/SystemTools.cxx

@@ -1249,14 +1249,6 @@ kwsys_stl::string SystemTools::FindLibrary(const char* name,
       {
       return SystemTools::CollapseFullPath(tryPath.c_str());
       }
-    tryPath = *p;
-    tryPath += "/";
-    tryPath += name;
-    tryPath += ".dll";
-    if(SystemTools::FileExists(tryPath.c_str()))
-      {
-      return SystemTools::CollapseFullPath(tryPath.c_str());
-      }
 #endif
     }