[Plplot-cvs] SF.net SVN: plplot:[9827] trunk/cmake/modules/wingcc.cmake

[<arj...@us...>]

Revision: 9827
          http://plplot.svn.sourceforge.net/plplot/?rev=9827&view=rev
Author:   arjenmarkus
Date:     2009-04-22 04:22:17 +0000 (Wed, 22 Apr 2009)

Log Message:
-----------
Reversing earlier change: CMake 2.6.3 solves the issue of the import libraries for MSYS

Modified Paths:
--------------
    trunk/cmake/modules/wingcc.cmake

Modified: trunk/cmake/modules/wingcc.cmake
===================================================================
--- trunk/cmake/modules/wingcc.cmake	2009-04-21 19:36:21 UTC (rev 9826)
+++ trunk/cmake/modules/wingcc.cmake	2009-04-22 04:22:17 UTC (rev 9827)
@@ -29,20 +29,10 @@
 
 if(PLD_wingcc)
   message(STATUS "Looking for gdi32 header and library")
-  if(NOT MSYS)
-    find_library(GDI32_LIBRARY gdi32 HINTS ${MINGWLIBPATH} ${BORLANDLIBPATH})
-    if(GDI32_LIBRARY)
-      find_library(COMDLG32_LIBRARY comdlg32 HINTS ${MINGWLIBPATH} ${BORLANDLIBPATH})
-    endif(GDI32_LIBRARY)
-  else(NOT MSYS)
-    # Use fixed names instead
-    # Note: MINGWLIBPATH gave problem: CACHE unknown component
-    get_filename_component(msys_BIN ${CMAKE_C_COMPILER} PATH)
-    set(msys_LIBDIR ${msys_BIN}/../lib)
-    #get_filename_component(msys_LIBDIR ${msys_LIBS} PATH)
-    set(GDI32_LIBRARY ${msys_LIBDIR}/libgdi32.a)
-    set(COMDLG32_LIBRARY ${msys_LIBDIR}/libcomdlg32.a)
-  endif(NOT MSYS)
+  find_library(GDI32_LIBRARY gdi32 HINTS ${MINGWLIBPATH} ${BORLANDLIBPATH})
+  if(GDI32_LIBRARY)
+    find_library(COMDLG32_LIBRARY comdlg32 HINTS ${MINGWLIBPATH} ${BORLANDLIBPATH})
+  endif(GDI32_LIBRARY)
   if(GDI32_LIBRARY AND COMDLG32_LIBRARY)
     message(STATUS "Looking for gdi32 header and library - found")
     set(wingcc_LINK_FLAGS "${GDI32_LIBRARY};${COMDLG32_LIBRARY}")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.