plplot-cvs

[Plplot-cvs] SF.net SVN: plplot:[12363] trunk/cmake/build_projects/libharu/README. libharu

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

Revision: 12363
          http://sourceforge.net/p/plplot/code/12363
Author:   airwin
Date:     2013-06-04 21:52:20 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
Update description of build system + fixes for libharu.

Modified Paths:
--------------
    trunk/cmake/build_projects/libharu/README.libharu

Modified: trunk/cmake/build_projects/libharu/README.libharu
===================================================================
--- trunk/cmake/build_projects/libharu/README.libharu	2013-06-04 21:51:31 UTC (rev 12362)
+++ trunk/cmake/build_projects/libharu/README.libharu	2013-06-04 21:52:20 UTC (rev 12363)
@@ -4,6 +4,13 @@
 
 README.libharu
 
+CMake logic that automatically builds libharu as part of the "Build
+Projects" project (see CMakeLists.txt file in the parent directory)
+that uses ExternalProject_Add to build projects that have a ep.cmake
+file:
+
+ep.cmake
+
 Improved build system (Werner's build system culled from the
 git version of libharu with additional improvements by me):
 
@@ -24,16 +31,32 @@
 
 include/hpdf.h
 
-(1) copy this directory and all subdirectories on top of a pre-existing
-freshly unpacked version of libharu-2.1.0, e.g.,
+Bug fix for the case where zlib is not available.
 
-cp -a /home/software/plplot_svn/HEAD/plplot_cmake_qt/cmake/external/libharu/* libharu-2.1.0
+include_hpdf_config.h.patch
 
+(1) copy selected files from here on top of a pre-existing freshly
+unpacked version of libharu-2.1.0, e.g.,
+
+mkdir -p /home/software/libharu/libharu-2.1.0/cmake/modules
+cp -f libharu/CMakeLists.txt /home/software/libharu/libharu-2.1.0
+cp -f libharu/demo/CMakeLists.txt /home/software/libharu/libharu-2.1.0/demo
+cp -f libharu/src/hpdf_page_operator.c libharu/src/CMakeLists.txt \
+/home/software/libharu/libharu-2.1.0/src
+cp -f libharu/cmake/modules/haru.cmake libharu/cmake/modules/summary.cmake \
+/home/software/libharu/libharu-2.1.0/cmake/modules
+cp -f libharu/include/hpdf_consts.h libharu/include/hpdf_config.h.cmake \
+libharu/include/hpdf.h libharu/include/CMakeLists.txt \
+/home/software/libharu/libharu-2.1.0/include
+
 N.B. libharu-2.1.0 has no cmake-based build-system at all (unlike the
 git version) so this cp operation installs that as well as changes to
 implement the larger font size support and gcc visibility.
 
-(2) configure, build, and install libharu starting with an empty build tree
+(2) Fix bug for case when zlib is not available.
+patch -d /home/software/libharu/libharu-2.1.0 -p1 < libharu/include_hpdf_config.h.patch
+
+(3) configure, build, and install libharu starting with an empty build tree
 and empty install tree, e.g.,
 
 rm -rf /home/software/libharu/build_dir/* /home/software/libharu/install
@@ -53,11 +76,7 @@
 Also note that -DLIBHARU_EXAMPLES=ON builds the demos, but does not
 test them.
 
-N.B. This improved CMake-based build system only tested for Linux for
-now, but the unimproved version presumably worked for Werner for his
-Windows platforms, and I have tried to be careful to minimize my changes
-to Werner's work so this build system _should_ continue to work on
-Windows systems (including Wine).  As far as I know, this improved
-build system _should_ also work on Mac OS X.  Of course, testing of
-the improved build system on Windows and Mac OS X platforms is
-required to demonstrate all is well on those platforms.
+N.B. This improved CMake-based build system has been tested for both
+Linux and MinGW/MSYS now using the "Build Projects" project (see the
+CMakeLists.txt file in the parent directory).  As far as I know, this
+improved build system _should_ also work on Mac OS X.

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

[Plplot-cvs] SF.net SVN: plplot:[12620] trunk/cmake/build_projects/libharu/README. libharu

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

Revision: 12620
          http://sourceforge.net/p/plplot/code/12620
Author:   airwin
Date:     2013-10-23 06:04:04 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
Update documentation based on a new name (removed_configured.patch)
and different purpose (remove a configured file) for one of the patch
files that makes another patch file (missing_zlib_headers.patch)
redundant and therefore removed.

Modified Paths:
--------------
    trunk/cmake/build_projects/libharu/README.libharu

Modified: trunk/cmake/build_projects/libharu/README.libharu
===================================================================
--- trunk/cmake/build_projects/libharu/README.libharu	2013-10-23 05:54:35 UTC (rev 12619)
+++ trunk/cmake/build_projects/libharu/README.libharu	2013-10-23 06:04:04 UTC (rev 12620)
@@ -12,7 +12,7 @@
 bp.cmake
 
 Improved build system (Werner's build system culled from the
-git version of libharu with additional improvements by me):
+git version of libharu in 2010 or so with additional improvements by me):
 
 cmake.patch
 
@@ -24,9 +24,14 @@
 
 visibility.patch
 
-Bug fix for the case where zlib is not available.
+This patch is to remove a configured file from the tarball that made a
+build with a separate build tree impossible since it's name was the
+same as the configured file include/hpdf_config.h in the build tree,
+but its location in the source tree took precedence in the header
+search path thus incorrectly imposing the configuration of the
+computer that created the tarball.
 
-missing_zlib_headers.patch
+remove_configured.patch
 
 (1) Patch a pre-existing freshly unpacked version of libharu-2.2.1,
 with these patches, e.g.,
@@ -34,7 +39,7 @@
 patch -d /home/software/libharu/libharu-2.2.1 -p1 < cmake.patch
 patch -d /home/software/libharu/libharu-2.2.1 -p1 < large_font.patch
 patch -d /home/software/libharu/libharu-2.2.1 -p1 < visibility.patch
-patch -d /home/software/libharu/libharu-2.2.1 -p1 < missing_zlib_headers.patch
+patch -d /home/software/libharu/libharu-2.2.1 -p1 < remove_configured.patch
 
 (2) configure, build, and install libharu starting with an empty build tree
 and empty install tree, e.g.,

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