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

Fix install test fail on mingw

Browse Source
This commit is contained in:
Bill Hoffman 2004-02-12 09:13:31 -05:00
parent 729e2a427a
commit 6223d60085
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/kwsys/SystemTools.cxx
View File

@ -1249,6 +1249,14 @@ 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
} }

4
Tests/SimpleInstall/CMakeLists.txt
View File

@ -31,9 +31,9 @@ IF(STAGE2)
SET(t1NAMES test1 test1${CMAKE_DEBUG_POSTFIX}) SET(t1NAMES test1 test1${CMAKE_DEBUG_POSTFIX})
SET(t2NAMES test2 test2${CMAKE_DEBUG_POSTFIX}) SET(t2NAMES test2 test2${CMAKE_DEBUG_POSTFIX})
IF(WIN32 AND UNIX) IF(CYGWIN OR MINGW)
SET(LIBPATHS ${LIBPATHS} "${CMAKE_INSTALL_PREFIX}/bin") SET(LIBPATHS ${LIBPATHS} "${CMAKE_INSTALL_PREFIX}/bin")
ENDIF(WIN32 AND UNIX) ENDIF(CYGWIN OR MINGW)
MESSAGE("Search for library in: ${LIBPATHS}") MESSAGE("Search for library in: ${LIBPATHS}")
FIND_LIBRARY(TEST1_LIBRARY FIND_LIBRARY(TEST1_LIBRARY
NAMES ${t1NAMES} NAMES ${t1NAMES}

4
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -31,9 +31,9 @@ IF(STAGE2)
SET(t1NAMES test1 test1${CMAKE_DEBUG_POSTFIX}) SET(t1NAMES test1 test1${CMAKE_DEBUG_POSTFIX})
SET(t2NAMES test2 test2${CMAKE_DEBUG_POSTFIX}) SET(t2NAMES test2 test2${CMAKE_DEBUG_POSTFIX})
IF(WIN32 AND UNIX) IF(CYGWIN OR MINGW)
SET(LIBPATHS ${LIBPATHS} "${CMAKE_INSTALL_PREFIX}/bin") SET(LIBPATHS ${LIBPATHS} "${CMAKE_INSTALL_PREFIX}/bin")
ENDIF(WIN32 AND UNIX) ENDIF(CYGWIN OR MINGW)
MESSAGE("Search for library in: ${LIBPATHS}") MESSAGE("Search for library in: ${LIBPATHS}")
FIND_LIBRARY(TEST1_LIBRARY FIND_LIBRARY(TEST1_LIBRARY
NAMES ${t1NAMES} NAMES ${t1NAMES}