diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-02-13 15:51:44 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-02-13 15:51:44 (GMT) |
| commit | f7ce6549125e645abba5801bbbde235099ba6ee5 (patch) | |
| tree | 63360776e0afc2c557ecdc840d94318dde1f0b98 | |
| parent | c44d0ef7333b274db929281aaba7b26146ebfac3 (diff) | |
| download | CMake-f7ce6549125e645abba5801bbbde235099ba6ee5.zip CMake-f7ce6549125e645abba5801bbbde235099ba6ee5.tar.gz CMake-f7ce6549125e645abba5801bbbde235099ba6ee5.tar.bz2 | |
ENH: change mingw to use libfoo.dll instead of foo.dll since it can link to them
| -rw-r--r-- | Modules/Platform/Windows-gcc.cmake | 2 | ||||
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/Modules/Platform/Windows-gcc.cmake b/Modules/Platform/Windows-gcc.cmake index a927a77..c38df85 100644 --- a/Modules/Platform/Windows-gcc.cmake +++ b/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 diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 82acc93..ac5c1b0 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/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 } |