Commit a35d911d authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: MinGW build now passes all the tests

parent f9064ee9
SET(CMAKE_LINK_LIBRARY_SUFFIX "")
SET(CMAKE_STATIC_LIBRARY_PREFIX "lib")
SET(CMAKE_STATIC_LIBRARY_SUFFIX ".a")
SET(CMAKE_SHARED_LIBRARY_PREFIX "lib") # lib
SET(CMAKE_SHARED_LIBRARY_SUFFIX ".so") # .so
SET(CMAKE_SHARED_LIBRARY_PREFIX "") # lib
SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dll") # .so
SET(CMAKE_DL_LIBS "")
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "") # -pic
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") # -shared
......
......@@ -19,7 +19,9 @@ IF (UNIX)
ELSE(UNIX)
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys)
IF (NOT BORLAND)
TARGET_LINK_LIBRARIES(complex rpcrt4.lib)
IF(NOT MINGW)
TARGET_LINK_LIBRARIES(complex rpcrt4.lib)
ENDIF(NOT MINGW)
ENDIF(NOT BORLAND)
ENDIF (UNIX)
......
......@@ -115,7 +115,9 @@ int main()
cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str());
if(!handle)
{
cmFailed("Can not open CMakeTestModule");
std::string err = "Can not open CMakeTestModule:";
err += lib;
cmFailed(lib.c_str());
}
else
{
......
......@@ -23,12 +23,14 @@ ADD_LIBRARY(CMakeTestLibrary ${LibrarySources})
IF(WIN32)
IF(NOT CYGWIN)
IF(NOT BORLAND)
TARGET_LINK_LIBRARIES(CMakeTestLibrary
debug
user32.lib)
TARGET_LINK_LIBRARIES(CMakeTestLibrary
optimized
kernel32.lib)
IF(NOT MINGW)
TARGET_LINK_LIBRARIES(CMakeTestLibrary
debug
user32.lib)
TARGET_LINK_LIBRARIES(CMakeTestLibrary
optimized
kernel32.lib)
ENDIF(NOT MINGW)
ENDIF(NOT BORLAND)
ENDIF(NOT CYGWIN)
ENDIF(WIN32)
......
......@@ -19,7 +19,9 @@ IF (UNIX)
ELSE(UNIX)
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys)
IF (NOT BORLAND)
TARGET_LINK_LIBRARIES(complex rpcrt4.lib)
IF(NOT MINGW)
TARGET_LINK_LIBRARIES(complex rpcrt4.lib)
ENDIF(NOT MINGW)
ENDIF(NOT BORLAND)
ENDIF (UNIX)
......
......@@ -115,7 +115,9 @@ int main()
cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str());
if(!handle)
{
cmFailed("Can not open CMakeTestModule");
std::string err = "Can not open CMakeTestModule:";
err += lib;
cmFailed(lib.c_str());
}
else
{
......
......@@ -23,12 +23,14 @@ ADD_LIBRARY(CMakeTestLibrary ${LibrarySources})
IF(WIN32)
IF(NOT CYGWIN)
IF(NOT BORLAND)
TARGET_LINK_LIBRARIES(CMakeTestLibrary
debug
user32.lib)
TARGET_LINK_LIBRARIES(CMakeTestLibrary
optimized
kernel32.lib)
IF(NOT MINGW)
TARGET_LINK_LIBRARIES(CMakeTestLibrary
debug
user32.lib)
TARGET_LINK_LIBRARIES(CMakeTestLibrary
optimized
kernel32.lib)
ENDIF(NOT MINGW)
ENDIF(NOT BORLAND)
ENDIF(NOT CYGWIN)
ENDIF(WIN32)
......
......@@ -19,7 +19,9 @@ IF (UNIX)
ELSE(UNIX)
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys)
IF (NOT BORLAND)
TARGET_LINK_LIBRARIES(complex rpcrt4.lib)
IF(NOT MINGW)
TARGET_LINK_LIBRARIES(complex rpcrt4.lib)
ENDIF(NOT MINGW)
ENDIF(NOT BORLAND)
ENDIF (UNIX)
......
......@@ -115,7 +115,9 @@ int main()
cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str());
if(!handle)
{
cmFailed("Can not open CMakeTestModule");
std::string err = "Can not open CMakeTestModule:";
err += lib;
cmFailed(lib.c_str());
}
else
{
......
......@@ -23,12 +23,14 @@ ADD_LIBRARY(CMakeTestLibrary ${LibrarySources})
IF(WIN32)
IF(NOT CYGWIN)
IF(NOT BORLAND)
TARGET_LINK_LIBRARIES(CMakeTestLibrary
debug
user32.lib)
TARGET_LINK_LIBRARIES(CMakeTestLibrary
optimized
kernel32.lib)
IF(NOT MINGW)
TARGET_LINK_LIBRARIES(CMakeTestLibrary
debug
user32.lib)
TARGET_LINK_LIBRARIES(CMakeTestLibrary
optimized
kernel32.lib)
ENDIF(NOT MINGW)
ENDIF(NOT BORLAND)
ENDIF(NOT CYGWIN)
ENDIF(WIN32)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment