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

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

Revision: 12815
          http://sourceforge.net/p/plplot/code/12815
Author:   airwin
Date:     2013-12-05 22:52:36 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
Hopefully this is the last correction from the BP_ prefix to the
correct EPA_ prefix for variable names.  This 
affects the swig build in the BUILD_THE_BUILDTOOLS case
(which libpcre library to use) 
and fixes the libxml2 build.

Modified Paths:
--------------
    trunk/cmake/epa_build/add_packages.xml
    trunk/cmake/epa_build/libxml2/CMakeLists.txt
    trunk/cmake/epa_build/swig/CMakeLists.txt

Modified: trunk/cmake/epa_build/add_packages.xml
===================================================================
--- trunk/cmake/epa_build/add_packages.xml	2013-12-05 22:46:13 UTC (rev 12814)
+++ trunk/cmake/epa_build/add_packages.xml	2013-12-05 22:52:36 UTC (rev 12815)
@@ -21,7 +21,7 @@
 <!-- without these python shenanigans the python components of libxml2 are
 installed with the system prefix rather than desired special prefix
 -->
-  <autotools id="libxml2" makeargs="PYTHON_SITE_PACKAGES=${BP_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages">
+  <autotools id="libxml2" makeargs="PYTHON_SITE_PACKAGES=${EPA_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages">
     <branch hash="md5:9c0cfef285d5c4a5c80d00904ddab380" module="sources/libxml2-2.9.1.tar.gz" repo="http://xmlsoft.org/" size="983500" version="2.9.1"/>
 <!-- This package (which installs nothing on Unix platforms) is
 required as a workaround for the xmlcatalog argument mangling that
@@ -44,7 +44,7 @@
   <autotools autogenargs="--enable-unicode-properties --enable-pcre16 --enable-pcre32 --disable-static" id="libpcre">
     <branch hash="md5:21514018448ac10062ece7a668fca949" module="pcre/pcre-8.33.tar.bz2" repo="http://downloads.sourceforge.net/" size="1211146" version="8.33"/>
   </autotools>
-  <autotools autogenargs="--with-pcre-prefix=${BP_CMAKE_INSTALL_PREFIX}" id="swig">
+  <autotools autogenargs="--with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}" id="swig">
     <branch hash="sha256:63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e" module="swig/swig/swig-2.0.11/swig-2.0.11.tar.gz" repo="http://downloads.sourceforge.net/" size="1211146" version="6.8"/>
     <dependencies>
       <dep package="libpcre"/>

Modified: trunk/cmake/epa_build/libxml2/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libxml2/CMakeLists.txt	2013-12-05 22:46:13 UTC (rev 12814)
+++ trunk/cmake/epa_build/libxml2/CMakeLists.txt	2013-12-05 22:52:36 UTC (rev 12815)
@@ -69,7 +69,7 @@
   URL ${URL}
   URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
   CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} 
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} PYTHON_SITE_PACKAGES=${BP_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages
+  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} PYTHON_SITE_PACKAGES=${EPA_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages
   BUILD_IN_SOURCE OFF
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} PYTHON_SITE_PACKAGES=${BP_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages install
+  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} PYTHON_SITE_PACKAGES=${EPA_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages install
   )

Modified: trunk/cmake/epa_build/swig/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/swig/CMakeLists.txt	2013-12-05 22:46:13 UTC (rev 12814)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt	2013-12-05 22:52:36 UTC (rev 12815)
@@ -68,7 +68,7 @@
   DEPENDS ${dependencies_targets}
   URL ${URL}
   URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${BP_CMAKE_INSTALL_PREFIX}
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} 
   BUILD_IN_SOURCE OFF
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}  install

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