2 files changed, 6 insertions, 2 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
     {