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

ENH: MinGW build now passes all the tests

This commit is contained in:
Bill Hoffman 2003-08-27 16:42:01 -04:00
parent f9064ee91a
commit a35d911def
10 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Platform/Windows-gcc.cmake
View File

@ -1,8 +1,8 @@
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") # lib SET(CMAKE_SHARED_LIBRARY_PREFIX "") # lib
SET(CMAKE_SHARED_LIBRARY_SUFFIX ".so") # .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
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") # -shared SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") # -shared

4
Tests/Complex/Executable/CMakeLists.txt
View File

@ -19,7 +19,9 @@ IF (UNIX)
ELSE(UNIX) ELSE(UNIX)
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys) TARGET_LINK_LIBRARIES(complex CMakeLib cmsys)
IF (NOT BORLAND) 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(NOT BORLAND)
ENDIF (UNIX) ENDIF (UNIX)

4
Tests/Complex/Executable/complex.cxx
View File

@ -115,7 +115,9 @@ int main()
cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str());
if(!handle) if(!handle)
{ {
cmFailed("Can not open CMakeTestModule"); std::string err = "Can not open CMakeTestModule:";
err += lib;
cmFailed(lib.c_str());
} }
else else
{ {

14
Tests/Complex/Library/CMakeLists.txt
View File

@ -23,12 +23,14 @@ ADD_LIBRARY(CMakeTestLibrary ${LibrarySources})
IF(WIN32) IF(WIN32)
IF(NOT CYGWIN) IF(NOT CYGWIN)
IF(NOT BORLAND) IF(NOT BORLAND)
TARGET_LINK_LIBRARIES(CMakeTestLibrary IF(NOT MINGW)
debug TARGET_LINK_LIBRARIES(CMakeTestLibrary
user32.lib) debug
TARGET_LINK_LIBRARIES(CMakeTestLibrary user32.lib)
optimized TARGET_LINK_LIBRARIES(CMakeTestLibrary
kernel32.lib) optimized
kernel32.lib)
ENDIF(NOT MINGW)
ENDIF(NOT BORLAND) ENDIF(NOT BORLAND)
ENDIF(NOT CYGWIN) ENDIF(NOT CYGWIN)
ENDIF(WIN32) ENDIF(WIN32)

4
Tests/ComplexOneConfig/Executable/CMakeLists.txt
View File

@ -19,7 +19,9 @@ IF (UNIX)
ELSE(UNIX) ELSE(UNIX)
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys) TARGET_LINK_LIBRARIES(complex CMakeLib cmsys)
IF (NOT BORLAND) 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(NOT BORLAND)
ENDIF (UNIX) ENDIF (UNIX)

4
Tests/ComplexOneConfig/Executable/complex.cxx
View File

@ -115,7 +115,9 @@ int main()
cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str());
if(!handle) if(!handle)
{ {
cmFailed("Can not open CMakeTestModule"); std::string err = "Can not open CMakeTestModule:";
err += lib;
cmFailed(lib.c_str());
} }
else else
{ {

14
Tests/ComplexOneConfig/Library/CMakeLists.txt
View File

@ -23,12 +23,14 @@ ADD_LIBRARY(CMakeTestLibrary ${LibrarySources})
IF(WIN32) IF(WIN32)
IF(NOT CYGWIN) IF(NOT CYGWIN)
IF(NOT BORLAND) IF(NOT BORLAND)
TARGET_LINK_LIBRARIES(CMakeTestLibrary IF(NOT MINGW)
debug TARGET_LINK_LIBRARIES(CMakeTestLibrary
user32.lib) debug
TARGET_LINK_LIBRARIES(CMakeTestLibrary user32.lib)
optimized TARGET_LINK_LIBRARIES(CMakeTestLibrary
kernel32.lib) optimized
kernel32.lib)
ENDIF(NOT MINGW)
ENDIF(NOT BORLAND) ENDIF(NOT BORLAND)
ENDIF(NOT CYGWIN) ENDIF(NOT CYGWIN)
ENDIF(WIN32) ENDIF(WIN32)

4
Tests/ComplexRelativePaths/Executable/CMakeLists.txt
View File

@ -19,7 +19,9 @@ IF (UNIX)
ELSE(UNIX) ELSE(UNIX)
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys) TARGET_LINK_LIBRARIES(complex CMakeLib cmsys)
IF (NOT BORLAND) 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(NOT BORLAND)
ENDIF (UNIX) ENDIF (UNIX)

4
Tests/ComplexRelativePaths/Executable/complex.cxx
View File

@ -115,7 +115,9 @@ int main()
cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str());
if(!handle) if(!handle)
{ {
cmFailed("Can not open CMakeTestModule"); std::string err = "Can not open CMakeTestModule:";
err += lib;
cmFailed(lib.c_str());
} }
else else
{ {

14
Tests/ComplexRelativePaths/Library/CMakeLists.txt
View File

@ -23,12 +23,14 @@ ADD_LIBRARY(CMakeTestLibrary ${LibrarySources})
IF(WIN32) IF(WIN32)
IF(NOT CYGWIN) IF(NOT CYGWIN)
IF(NOT BORLAND) IF(NOT BORLAND)
TARGET_LINK_LIBRARIES(CMakeTestLibrary IF(NOT MINGW)
debug TARGET_LINK_LIBRARIES(CMakeTestLibrary
user32.lib) debug
TARGET_LINK_LIBRARIES(CMakeTestLibrary user32.lib)
optimized TARGET_LINK_LIBRARIES(CMakeTestLibrary
kernel32.lib) optimized
kernel32.lib)
ENDIF(NOT MINGW)
ENDIF(NOT BORLAND) ENDIF(NOT BORLAND)
ENDIF(NOT CYGWIN) ENDIF(NOT CYGWIN)
ENDIF(WIN32) ENDIF(WIN32)