diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2003-08-27 20:42:01 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2003-08-27 20:42:01 (GMT) |
| commit | a35d911defc912e3d5f1cbbf292493cbcec6f238 (patch) | |
| tree | e3a35f003cccbc58195d9fad66bf4e8ae1b5ccf9 /Tests/ComplexRelativePaths | |
| parent | f9064ee91ad837645e04ac4d396c3f202d7a4a2d (diff) | |
| download | CMake-a35d911defc912e3d5f1cbbf292493cbcec6f238.zip CMake-a35d911defc912e3d5f1cbbf292493cbcec6f238.tar.gz CMake-a35d911defc912e3d5f1cbbf292493cbcec6f238.tar.bz2 | |
ENH: MinGW build now passes all the tests
Diffstat (limited to 'Tests/ComplexRelativePaths')
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/complex.cxx | 4 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Library/CMakeLists.txt | 14 |
3 files changed, 14 insertions, 8 deletions
diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index 5e88795..26626a6 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -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) diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx index 208e9fd..067bf66 100644 --- a/Tests/ComplexRelativePaths/Executable/complex.cxx +++ b/Tests/ComplexRelativePaths/Executable/complex.cxx @@ -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 { diff --git a/Tests/ComplexRelativePaths/Library/CMakeLists.txt b/Tests/ComplexRelativePaths/Library/CMakeLists.txt index 0df970b..488f4e7 100644 --- a/Tests/ComplexRelativePaths/Library/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Library/CMakeLists.txt @@ -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) |