[Plplot-cvs] SF.net SVN: plplot:[12367] trunk/cmake/build_projects

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

Revision: 12367
          http://sourceforge.net/p/plplot/code/12367
Author:   airwin
Date:     2013-06-05 01:52:14 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
Replaced all temporary downloads with actual downloads since most of
these build subprojects are thoroughly debugged.  During the test
of this change discovered that the download of the libqhull-2010.1 snapshot
was actually a different snapshot (~4 months later) than the download
I had collected before with this same filename.  So I had to change
the associated MD5sum accordingly.  Furthermore, the latest "2010.1"
version of libqhull continues to build without issues.

Add faux PLplot build which for now just takes care of PLplot build
dependencies for the "Build Projects" project without actually
building PLplot

Tested by: Alan W. Irwin <ai...@us...> for both Linux
and MinGW/MSYS/Wine platforms using the build_plplot target.

N.B. from the qhull notes, the gcc option -f-no-strict-aliasing must
be used for qset.c for 2010.1 This only matters if you use -O2, -O3, or
-Os. I haven't decided whether to bother with this or try to use the
latest libqhull instead where this restriction has been removed.

Modified Paths:
--------------
    trunk/cmake/build_projects/CMakeLists.txt
    trunk/cmake/build_projects/libagg/ep.cmake
    trunk/cmake/build_projects/libharu/ep.cmake
    trunk/cmake/build_projects/libqhull/ep.cmake
    trunk/cmake/build_projects/ndiff/ep.cmake
    trunk/cmake/build_projects/shapelib/ep.cmake

Added Paths:
-----------
    trunk/cmake/build_projects/plplot/
    trunk/cmake/build_projects/plplot/ep.cmake

Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt	2013-06-04 23:40:49 UTC (rev 12366)
+++ trunk/cmake/build_projects/CMakeLists.txt	2013-06-05 01:52:14 UTC (rev 12367)
@@ -74,8 +74,13 @@
   endfunction(determine_msys_path)
 endif(MSYS)
 
-include(shapelib/ep.cmake)
+# Now include the build configurations for certain targets and their
+# dependencies.
+
+# Configure a build of ndiff.  The ndiff application is not a a PLplot
+# dependency, but still this fuzzy diff is quite useful for PLplot
+# developers.
 include(ndiff/ep.cmake)
-include(libqhull/ep.cmake)
-include(libharu/ep.cmake)
-include(libagg/ep.cmake)
+
+# Configure a build of PLplot and its dependencies.
+include(plplot/ep.cmake)
\ No newline at end of file

Modified: trunk/cmake/build_projects/libagg/ep.cmake
===================================================================
--- trunk/cmake/build_projects/libagg/ep.cmake	2013-06-04 23:40:49 UTC (rev 12366)
+++ trunk/cmake/build_projects/libagg/ep.cmake	2013-06-05 01:52:14 UTC (rev 12367)
@@ -26,8 +26,6 @@
 
 # Data that is related to downloads.
 set(libagg_URL http://www.antigrain.com/agg-2.5.tar.gz)
-# TEMPORARY local version for debugging
-set(libagg_URL /home/software/libagg/agg-2.5.tar.gz)
 set(libagg_URL_MD5 0229a488bc47be10a2fee6cf0b2febd6)
 
 # Data that is related to the PATH that must be used.

Modified: trunk/cmake/build_projects/libharu/ep.cmake
===================================================================
--- trunk/cmake/build_projects/libharu/ep.cmake	2013-06-04 23:40:49 UTC (rev 12366)
+++ trunk/cmake/build_projects/libharu/ep.cmake	2013-06-05 01:52:14 UTC (rev 12367)
@@ -26,8 +26,6 @@
 
 # Data that is related to downloads.
 set(libharu_URL http://libharu.org/files/libharu-2.1.0.tar.gz)
-# TEMPORARY local version for debugging
-set(libharu_URL /home/software/libharu/libharu-2.1.0.tar.gz)
 set(libharu_URL_MD5 0623b8fb08ae1b28af08b2cdbd66b662)
 
 # Data that is related to the PATH that must be used.
@@ -46,9 +44,7 @@
   # should drop this option for anything after 2.1.0.  Also note that
   # -DLIBHARU_EXAMPLES=ON builds the demos, but does not test them.
   CONFIGURE_COMMAND env PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DPOST_2.1.0=OFF -DLIBHARU_EXAMPLES=ON ${EP_BASE}/Source/build_libharu
-  # TEMPORARY
-  #BUILD_COMMAND ${BP_PARALLEL_BUILD_COMMAND}
-  BUILD_COMMAND ${BP_NON_PARALLEL_BUILD_COMMAND}
+  BUILD_COMMAND ${BP_PARALLEL_BUILD_COMMAND}
   INSTALL_COMMAND ${BP_PARALLEL_BUILD_COMMAND} install
   STEP_TARGETS download update_build_system configure build install test
   )

Modified: trunk/cmake/build_projects/libqhull/ep.cmake
===================================================================
--- trunk/cmake/build_projects/libqhull/ep.cmake	2013-06-04 23:40:49 UTC (rev 12366)
+++ trunk/cmake/build_projects/libqhull/ep.cmake	2013-06-05 01:52:14 UTC (rev 12367)
@@ -26,11 +26,8 @@
 
 # Data that is related to downloads.
 set(libqhull_URL http://www.qhull.org/download/qhull-2010.1-src.tgz)
-# TEMPORARY local version for debugging
-set(libqhull_URL /home/software/qhull/qhull-2010.1-src.tgz)
+set(libqhull_URL_MD5 e64138470acdeb18f752a0bc2a11ceb4)
 
-set(libqhull_URL_MD5 4cda99e10a9a41365021db7eb1e79b91)
-
 # Data that is related to the PATH that must be used.
 if(MSYS)
   #set(BP_PATH_NODLL "${BP_PATH}")

Modified: trunk/cmake/build_projects/ndiff/ep.cmake
===================================================================
--- trunk/cmake/build_projects/ndiff/ep.cmake	2013-06-04 23:40:49 UTC (rev 12366)
+++ trunk/cmake/build_projects/ndiff/ep.cmake	2013-06-05 01:52:14 UTC (rev 12367)
@@ -26,8 +26,6 @@
 
 # Data that is related to downloads.
 set(ndiff_URL ftp://ftp.math.utah.edu/pub/misc/ndiff-2.00.tar.gz)
-# TEMPORARY local version for debugging
-set(ndiff_URL /home/software/ndiff/ndiff-2.00.tar.gz)
 
 # The MD5 value below is correct for the gpg --verified version
 # Use URL_MD5 because ExternalProject_Add doesn't deal with gpg --version.

Added: trunk/cmake/build_projects/plplot/ep.cmake
===================================================================
--- trunk/cmake/build_projects/plplot/ep.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/plplot/ep.cmake	2013-06-05 01:52:14 UTC (rev 12367)
@@ -0,0 +1,20 @@
+# Configure build of PLplot dependencies.
+
+include(shapelib/ep.cmake)
+include(libqhull/ep.cmake)
+include(libharu/ep.cmake)
+include(libagg/ep.cmake)
+
+# Build PLplot itself.
+# (Not implemented yet, but create empty custom target with correct
+# target dependencies as if that target were actually a PLplot build).
+add_custom_target(build_plplot)
+add_dependencies(build_plplot 
+  build_shapelib
+  build_libqhull
+  build_libharu
+  build_libagg
+  )
+
+
+

Modified: trunk/cmake/build_projects/shapelib/ep.cmake
===================================================================
--- trunk/cmake/build_projects/shapelib/ep.cmake	2013-06-04 23:40:49 UTC (rev 12366)
+++ trunk/cmake/build_projects/shapelib/ep.cmake	2013-06-05 01:52:14 UTC (rev 12367)
@@ -26,13 +26,9 @@
 
 # Data that is related to downloads.
 set(shapelib_URL http://download.osgeo.org/shapelib/shapelib-1.3.0.tar.gz)
-# TEMPORARY local version for debugging
-set(shapelib_URL /home/software/shapelib/shapelib-1.3.0.tar.gz)
 set(shapelib_URL_MD5 2ff7d0b21d4b7506b452524492795f77)
 
 set(shape_eg_data_URL http://dl.maptools.org/dl/shapelib/shape_eg_data.zip)
-# TEMPORARY local version for debugging
-set(shape_eg_data_URL file:///home/software/shapelib/eg_data/shape_eg_data.zip)
 set(shape_eg_data_URL_MD5 36208abd5d34c5c80101d8b214109f0d)
 
 # Data that is related to the PATH that must be used.

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