plplot-cvs

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

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

Revision: 12935
          http://sourceforge.net/p/plplot/code/12935
Author:   airwin
Date:     2014-01-13 03:11:05 +0000 (Mon, 13 Jan 2014)
Log Message:
-----------
Give access to version 3 of the Itcl and Itk libraries on MinGW/MSYS.

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-01-12 03:12:25 UTC (rev 12934)
+++ trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain	2014-01-13 03:11:05 UTC (rev 12935)
@@ -51,8 +51,11 @@
 PATH=$CMAKE_PATH:$PATH
 PATH=$MINGW_PREFIX/bin/:$PATH
 
-# pkg-config setup.
+# Allow using -DBUILD_THE_BUILDTOOLS=ON results from epa_build
+# pkg-config, tclsh, and wish setup.
 PATH=$BUILDTOOLS_PREFIX/bin:$PATH
 
+# Allow using itcl3 and itk3 libraries:
+PATH=$BUILDTOOLS_PREFIX/lib/itcl3.4:$BUILDTOOLS_PREFIX/lib/itk3.3:$PATH
+
 export PKG_CONFIG_PATH=/z/home/wine/newstart/MinGW-4.7.2/msys/1.0/lib/pkgconfig:$BUILDTOOLS_PREFIX/share/pkgconfig:$BUILDTOOLS_PREFIX/lib/pkgconfig
-

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

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

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

Revision: 12979
          http://sourceforge.net/p/plplot/code/12979
Author:   airwin
Date:     2014-02-06 07:29:41 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
If cmake is epa_built as one of the buildtools on MinGW/MSYS
platforms, ignore it in favor of the more powerful Windows binary
version you can download from kitware.  This measure will be required
until the curl library and its dependencies (including openssl) are
configured as part of epa_build and made dependencies of the cmake
epa_build. Without access to an external curl, cmake drops back to its
internal curl library which does not allow downloads of "https" URLS
(essential for epa_build to work!).

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-02-06 05:14:46 UTC (rev 12978)
+++ trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain	2014-02-06 07:29:41 UTC (rev 12979)
@@ -44,13 +44,6 @@
 CMAKE_INCLUDE_PATH=$PYTHON_PATH/include:$CMAKE_INCLUDE_PATH
 CMAKE_LIBRARY_PATH=$PYTHON_PATH/libs:$CMAKE_LIBRARY_PATH
 
-# Put CMake, Python, subversion and MinGW on the PATH.
-
-PATH=$CMAKE_PATH:$PATH
-PATH=$PYTHON_PATH:$PATH
-PATH=$CMAKE_PATH:$PATH
-PATH=$MINGW_PREFIX/bin/:$PATH
-
 # Allow using -DBUILD_THE_BUILDTOOLS=ON results from epa_build
 # pkg-config, tclsh, and wish setup.
 PATH=$BUILDTOOLS_PREFIX/bin:$PATH
@@ -58,4 +51,12 @@
 # Allow using itcl3 and itk3 libraries:
 PATH=$BUILDTOOLS_PREFIX/lib/itcl3.4:$BUILDTOOLS_PREFIX/lib/itk3.3:$PATH
 
+# Put downloaded binary CMake (which overrides the buildtools result
+# for cmake which is weaker at the moment because of the lack of a
+# proper Curl library epa_build), Python, and MinGW on the PATH.
+
+PATH=$CMAKE_PATH:$PATH
+PATH=$PYTHON_PATH:$PATH
+PATH=$MINGW_PREFIX/bin/:$PATH
+
 export PKG_CONFIG_PATH=/z/home/wine/newstart/MinGW-4.7.2/msys/1.0/lib/pkgconfig:$BUILDTOOLS_PREFIX/share/pkgconfig:$BUILDTOOLS_PREFIX/lib/pkgconfig

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

[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.