[Plplot-cvs] SF.net SVN: plplot:[13116] trunk/cmake/epa_build

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

Revision: 13116
          http://sourceforge.net/p/plplot/code/13116
Author:   airwin
Date:     2014-05-14 05:45:44 +0000 (Wed, 14 May 2014)
Log Message:
-----------
As a trial possibility we use a binary downloaded version
of gtk+ on Windows.

Tested for the "MinGW Makefiles" generator on Wine-1.6.1.  cmake
apparently configured the cairo devices without issues so that
is a step forward for Walt Brainerd where this was a showstopper.
However, at least on Wine, the gdi.dll
library causes issues at "make install" time with the message

c:\windows\system32\gdi32.dll: file not recognized: File format not
recognized

So this trial is a work in progress.

Modified Paths:
--------------
    trunk/cmake/epa_build/plplot/CMakeLists.txt
    trunk/cmake/epa_build/setup/setup_mingw_makefiles
    trunk/cmake/epa_build/setup/setup_msys_makefiles

Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot/CMakeLists.txt	2014-05-14 05:36:26 UTC (rev 13115)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt	2014-05-14 05:45:44 UTC (rev 13116)
@@ -84,7 +84,9 @@
   # until the pango and qt5_lite packages and all their dependencies
   # build properly on that platform
   list(APPEND cmake_args
-    -DDEFAULT_NO_CAIRO_DEVICES:BOOL=ON
+    # Except as a trial possibility we use a binary downloaded version
+    # of gtk+ on Windows.
+    #-DDEFAULT_NO_CAIRO_DEVICES:BOOL=ON
     -DDEFAULT_NO_QT_DEVICES:BOOL=ON
     -DENABLE_qt=OFF
     )

Modified: trunk/cmake/epa_build/setup/setup_mingw_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_mingw_makefiles	2014-05-14 05:36:26 UTC (rev 13115)
+++ trunk/cmake/epa_build/setup/setup_mingw_makefiles	2014-05-14 05:45:44 UTC (rev 13116)
@@ -5,7 +5,7 @@
 source setup_mingw_msys_wine_toolchain
 
 # Tailor this install location for "MinGW Makefiles" builds to your local needs:
-export INSTALL_PREFIX=/z/home/wine/newstart/build_script/install-$WINEVERSION_mingw
+export INSTALL_PREFIX=/z/home/wine/newstart/build_script/install-${WINEVERSION}_mingw
 
 # End of tailored values.
 
@@ -40,4 +40,11 @@
 # view) PATH processing.  So make sure sh.exe is not on the PATH.
 PATH=$MINGW_PREFIX/msys/1.0/bin_without_sh/:$PATH
 
+# Temporary until epa_build of pango and its dependencies works on either
+# MinGW or MinGW/MSYS
+# N.B. put all PATH additions at the bottom so the epa_build versions prevail
+# (such as pkg-config) if they are available.
+PATH=$PATH:/z/home/wine/gtkplus/3.6.4/bin
+PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/z/home/wine/gtkplus/3.6.4/lib/pkgconfig
+
 export GENERATOR_STRING="MinGW Makefiles"

Modified: trunk/cmake/epa_build/setup/setup_msys_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_msys_makefiles	2014-05-14 05:36:26 UTC (rev 13115)
+++ trunk/cmake/epa_build/setup/setup_msys_makefiles	2014-05-14 05:45:44 UTC (rev 13116)
@@ -37,4 +37,11 @@
 # Put MSYS at the top of the PATH
 PATH=$MINGW_PREFIX/msys/1.0/bin/:$PATH
 
+# Temporary until epa_build of pango and its dependencies works on either
+# MinGW or MinGW/MSYS
+# N.B. put all PATH additions at the bottom so the epa_build versions prevail
+# (such as pkg-config) if they are available.
+PATH=$PATH:/z/home/wine/gtkplus/3.6.4/bin
+PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/z/home/wine/gtkplus/3.6.4/lib/pkgconfig
+
 export GENERATOR_STRING="MSYS Makefiles"

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