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