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

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

Revision: 12917
          http://sourceforge.net/p/plplot/code/12917
Author:   airwin
Date:     2014-01-04 22:38:22 +0000 (Sat, 04 Jan 2014)
Log Message:
-----------
Add a setup for the "MinGW Makefiles" generator case.

Add the MAKE_COMMAND environment variable for the "MSYS Makefiles"
generator case.

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

Added Paths:
-----------
    trunk/cmake/epa_build/setup/setup_mingw_makefiles

Added: trunk/cmake/epa_build/setup/setup_mingw_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_mingw_makefiles	                        (rev 0)
+++ trunk/cmake/epa_build/setup/setup_mingw_makefiles	2014-01-04 22:38:22 UTC (rev 12917)
@@ -0,0 +1,42 @@
+# This script should be sourced from an MSYS bash environment.  Its
+# purpose is to setup environment variables needed to run any standard
+# cmake "MinGW Makefiles" build on a Windows platform.
+
+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
+
+# End of tailored values.
+
+# Put buildtools that have been built and installed by build_packages on PATH.
+PATH=${INSTALL_PREFIX}_buildtools/bin:$PATH
+
+# Put install directory on PATH (so that, e.g., the wxwidgets 
+# configuration tool will be found.
+PATH=${INSTALL_PREFIX}/bin:$PATH
+
+# Put appropriate buildtools areas on these.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include:$CMAKE_INCLUDE_PATH
+CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}_buildtools/lib:$CMAKE_LIBRARY_PATH
+
+# Put version 3 of itcl and friends higher on CMAKE_INCLUDE_PATH then
+# the above default.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include/itcl3.4:$CMAKE_INCLUDE_PATH
+
+# Put appropriate install areas on these.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}/include:$CMAKE_INCLUDE_PATH
+CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}/lib:$CMAKE_LIBRARY_PATH
+
+# Put install-location pkg-config directories at top of PKG_CONFIG_PATH
+PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
+
+# MAKE_COMMAND contains the appropriate make command for this generator.
+export MAKE_COMMAND=mingw32-make
+
+# Apparently the presence of sh.exe on the PATH is a signal to
+# mingw32-make.exe to use different (incorrect from the CMake point of
+# view) PATH processing.  So make sure sh.exe is not on the PATH.
+PATH=$MINGW_PREFIX/msys/1.0/bin_without_sh/:$PATH
+
+export GENERATOR_STRING="MinGW Makefiles"

Modified: trunk/cmake/epa_build/setup/setup_msys_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_msys_makefiles	2013-12-31 18:06:30 UTC (rev 12916)
+++ trunk/cmake/epa_build/setup/setup_msys_makefiles	2014-01-04 22:38:22 UTC (rev 12917)
@@ -31,6 +31,9 @@
 # Put install-location pkg-config directories at top of PKG_CONFIG_PATH
 PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
 
+# MAKE_COMMAND contains the appropriate make command for this generator.
+export MAKE_COMMAND=make
+
 # Put MSYS at the top of the PATH
 PATH=$MINGW_PREFIX/msys/1.0/bin/:$PATH
 

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