[Plplot-cvs] SF.net SVN: plplot:[13119] trunk/cmake/epa_build/setup/ setup_mingw_msys_wine_toolchain

[<ai...@us...>]

Revision: 13119
          http://sourceforge.net/p/plplot/code/13119
Author:   airwin
Date:     2014-05-14 11:12:17 +0000 (Wed, 14 May 2014)
Log Message:
-----------
Help cmake find the correct version of the system gdi library that is
a prerequisite of cairo on Windows.

Modified Paths:
--------------
    trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain

Modified: trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain
===================================================================
--- trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain	2014-05-14 10:47:48 UTC (rev 13118)
+++ trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain	2014-05-14 11:12:17 UTC (rev 13119)
@@ -36,9 +36,11 @@
 # N.B. $MINGW_PREFIX/msys/1.0/include is equivalent to /usr/include on bash.
 export CMAKE_INCLUDE_PATH=$MINGW_PREFIX/msys/1.0/include:$MINGW_PREFIX/include:$MINGW_PREFIX/lib/gcc/mingw32/$MINGW_VERSION/include:/z/home/wine/wine_build/install-$WINEVERSION/include/wine/msvcrt:/z/home/wine/wine_build/install-$WINEVERSION/include/wine/windows
 
-# For MinGW on Wine, no help is required to find mingw, msys, or wine libraries
-# because the appropriate dll's are on the PATH.
-export CMAKE_LIBRARY_PATH=
+# For MinGW on Wine, normally no help is required to find mingw, msys,
+# or wine libraries because the appropriate dll's are on the PATH.
+# However, gdi is an exception where for some reason the Wine version
+# is not the appropriate format so use the MinGW version instead.
+export CMAKE_LIBRARY_PATH=$MINGW_PREFIX/lib
 
 # Help CMake find Python headers and library.
 CMAKE_INCLUDE_PATH=$PYTHON_PATH/include:$CMAKE_INCLUDE_PATH

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