Fix install test fail on mingw
This commit is contained in:
parent
729e2a427a
commit
6223d60085
|
@ -1249,6 +1249,14 @@ 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
|
||||
}
|
||||
|
||||
|
|
|
@ -31,9 +31,9 @@ IF(STAGE2)
|
|||
SET(t1NAMES test1 test1${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")
|
||||
ENDIF(WIN32 AND UNIX)
|
||||
ENDIF(CYGWIN OR MINGW)
|
||||
MESSAGE("Search for library in: ${LIBPATHS}")
|
||||
FIND_LIBRARY(TEST1_LIBRARY
|
||||
NAMES ${t1NAMES}
|
||||
|
|
|
@ -31,9 +31,9 @@ IF(STAGE2)
|
|||
SET(t1NAMES test1 test1${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")
|
||||
ENDIF(WIN32 AND UNIX)
|
||||
ENDIF(CYGWIN OR MINGW)
|
||||
MESSAGE("Search for library in: ${LIBPATHS}")
|
||||
FIND_LIBRARY(TEST1_LIBRARY
|
||||
NAMES ${t1NAMES}
|
||||
|
|
Loading…
Reference in New Issue