From: <ai...@us...> - 2013-06-04 21:52:23
|
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. |