ENH: change mingw to use libfoo.dll instead of foo.dll since it can link to them
This commit is contained in:
parent
c44d0ef733
commit
f7ce654912
|
@ -1,7 +1,7 @@
|
||||||
SET(CMAKE_LINK_LIBRARY_SUFFIX "")
|
SET(CMAKE_LINK_LIBRARY_SUFFIX "")
|
||||||
SET(CMAKE_STATIC_LIBRARY_PREFIX "lib")
|
SET(CMAKE_STATIC_LIBRARY_PREFIX "lib")
|
||||||
SET(CMAKE_STATIC_LIBRARY_SUFFIX ".a")
|
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_SHARED_LIBRARY_SUFFIX ".dll") # .so
|
||||||
SET(CMAKE_DL_LIBS "")
|
SET(CMAKE_DL_LIBS "")
|
||||||
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "") # -pic
|
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "") # -pic
|
||||||
|
|
|
@ -1249,14 +1249,6 @@ kwsys_stl::string SystemTools::FindLibrary(const char* name,
|
||||||
{
|
{
|
||||||
return SystemTools::CollapseFullPath(tryPath.c_str());
|
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
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue