From: <sm...@us...> - 2008-08-31 12:29:00
|
Revision: 8732 http://plplot.svn.sourceforge.net/plplot/?rev=8732&view=rev Author: smekal Date: 2008-08-31 12:29:08 +0000 (Sun, 31 Aug 2008) Log Message: ----------- Looking for the gdi32 and comdlg32 import libraries using MINGWLIBPATH as hint. This variable is not set for other compilers (e.g. Visual C), but Visual C should be able to link to the system dlls. We need mabye workaround for Borland and Watcom compilers. FindGD32.cmake can be removed if this solution works for all. Modified Paths: -------------- trunk/cmake/modules/wingcc.cmake Modified: trunk/cmake/modules/wingcc.cmake =================================================================== --- trunk/cmake/modules/wingcc.cmake 2008-08-31 12:25:36 UTC (rev 8731) +++ trunk/cmake/modules/wingcc.cmake 2008-08-31 12:29:08 UTC (rev 8732) @@ -29,13 +29,13 @@ if(PLD_wingcc) message(STATUS "Looking for gdi32 header and library") - find_package(GDI32) - if(GDI32_FOUND) - find_library(COMDLG32_LIBRARY comdlg32) - endif(GDI32_FOUND) - if(GDI32_FOUND AND COMDLG32_LIBRARY) + find_library(GDI32_LIBRARY gdi32 HINTS ${MINGWLIBPATH}) + if(GDI32_LIBRARY) + find_library(COMDLG32_LIBRARY comdlg32 HINTS ${MINGWLIBPATH}) + endif(GDI32_LIBRARY) + if(GDI32_LIBRARY AND COMDLG32_LIBRARY) message(STATUS "Looking for gdi32 header and library - found") - set(wingcc_LINK_FLAGS "${GDI32_LIBRARIES};${COMDLG32_LIBRARY}") + set(wingcc_LINK_FLAGS "${GDI32_LIBRARY};${COMDLG32_LIBRARY}") if(WITH_FREETYPE) set( wingcc_COMPILE_FLAGS @@ -48,9 +48,9 @@ ) endif(WITH_FREETYPE) set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${wingcc_LINK_FLAGS}) - else(GDI32_FOUND AND COMDLG32_LIBRARY) + else(GDI32_LIBRARY AND COMDLG32_LIBRARY) message(STATUS "Looking for gdi32 header and library - not found") message(STATUS "WARNING: Setting PLD_wingcc to OFF.") set(PLD_wingcc OFF CACHE BOOL "Enable wingcc device" FORCE) - endif(GDI32_FOUND AND COMDLG32_LIBRARY) + endif(GDI32_LIBRARY AND COMDLG32_LIBRARY) endif(PLD_wingcc) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2009-04-20 04:05:22
|
Revision: 9820 http://plplot.svn.sourceforge.net/plplot/?rev=9820&view=rev Author: arjenmarkus Date: 2009-04-20 04:05:20 +0000 (Mon, 20 Apr 2009) Log Message: ----------- Use "brute force" to determine the import libraries for gdi32.dll and comdlg32.dll under MSYS. Modified Paths: -------------- trunk/cmake/modules/wingcc.cmake Modified: trunk/cmake/modules/wingcc.cmake =================================================================== --- trunk/cmake/modules/wingcc.cmake 2009-04-18 01:20:09 UTC (rev 9819) +++ trunk/cmake/modules/wingcc.cmake 2009-04-20 04:05:20 UTC (rev 9820) @@ -23,16 +23,26 @@ # PLD_wingcc - ON means the wingcc device is enabled. # wingcc_COMPILE_FLAGS - individual COMPILE_FLAGS required to compile wingcc # device. -# wingcc_LINK_FLAGS - list of pathnames of libraries for dynamic +# wingcc_LINK_FLAGS - list of pathnames of libraries for dynamic # wingcc device. # DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static devices. if(PLD_wingcc) message(STATUS "Looking for gdi32 header and library") - find_library(GDI32_LIBRARY gdi32 HINTS ${MINGWLIBPATH} ${BORLANDLIBPATH}) - if(GDI32_LIBRARY) - find_library(COMDLG32_LIBRARY comdlg32 HINTS ${MINGWLIBPATH} ${BORLANDLIBPATH}) - endif(GDI32_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) if(GDI32_LIBRARY AND COMDLG32_LIBRARY) message(STATUS "Looking for gdi32 header and library - found") set(wingcc_LINK_FLAGS "${GDI32_LIBRARY};${COMDLG32_LIBRARY}") @@ -51,6 +61,6 @@ else(GDI32_LIBRARY AND COMDLG32_LIBRARY) message(STATUS "Looking for gdi32 header and library - not found") message(STATUS "WARNING: Setting PLD_wingcc to OFF.") - set(PLD_wingcc OFF CACHE BOOL "Enable wingcc device" FORCE) + set(PLD_wingcc OFF CACHE BOOL "Enable wingcc device" FORCE) endif(GDI32_LIBRARY AND COMDLG32_LIBRARY) endif(PLD_wingcc) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2009-04-22 04:22:28
|
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. |