| 
      
      
      From: <ai...@us...> - 2013-12-01 22:58:55
      
     | 
| Revision: 12793
          http://sourceforge.net/p/plplot/code/12793
Author:   airwin
Date:     2013-12-01 22:58:49 +0000 (Sun, 01 Dec 2013)
Log Message:
-----------
In preparation for renaming all the */bp.cmake files as
*/CMakeLists.txt files consistently rename the existing
*/CMakeLists.txt files (which are add-ons to the individual
software packages) everywhere they are used.
Tested by Alan W. Irwin <ai...@us...> on Linux by
building all the buildtools with epa_build using "make all" for the
-DBUILD_THE_BUILDTOOLS=ON case and by building plplot and all its
dependencies with epa_build using "make build_plplot".
N.B. note this testing does not test the MinGW/MSYS/Wine case where there is
a known issue with this renaming scheme that still has to be fixed
for the xmlcatalog-wrapper/bp.cmake (soon to be
xmlcatalog-wrapper/CMakeLists.txt) file.
Modified Paths:
--------------
    trunk/cmake/epa_build/docbook-xml/bp.cmake
    trunk/cmake/epa_build/docbook-xsl/bp.cmake
    trunk/cmake/epa_build/iwidgets/bp.cmake
    trunk/cmake/epa_build/libagg/bp.cmake
    trunk/cmake/epa_build/libqhull/README.libqhull
    trunk/cmake/epa_build/libqhull/bp.cmake
    trunk/cmake/epa_build/ndiff/README.ndiff
    trunk/cmake/epa_build/ndiff/bp.cmake
    trunk/cmake/epa_build/shapelib/README
    trunk/cmake/epa_build/shapelib/bp.cmake
Added Paths:
-----------
    trunk/cmake/epa_build/docbook-xml/docbook-xml_CMakeLists.txt
    trunk/cmake/epa_build/docbook-xsl/docbook-xsl_CMakeLists.txt
    trunk/cmake/epa_build/iwidgets/iwidgets_CMakeLists.txt
    trunk/cmake/epa_build/libagg/libagg_CMakeLists.txt
    trunk/cmake/epa_build/libqhull/libqhull_CMakeLists.txt
    trunk/cmake/epa_build/ndiff/ndiff_CMakeLists.txt
    trunk/cmake/epa_build/shapelib/shapelib_CMakeLists.txt
    trunk/cmake/epa_build/xmlcatalog-wrapper/xmlcatalog-wrapper_CMakeLists.txt
Removed Paths:
-------------
    trunk/cmake/epa_build/docbook-xml/CMakeLists.txt
    trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt
    trunk/cmake/epa_build/iwidgets/CMakeLists.txt
    trunk/cmake/epa_build/libagg/CMakeLists.txt
    trunk/cmake/epa_build/libqhull/CMakeLists.txt
    trunk/cmake/epa_build/ndiff/CMakeLists.txt
    trunk/cmake/epa_build/shapelib/CMakeLists.txt
    trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt
Deleted: trunk/cmake/epa_build/docbook-xml/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/docbook-xml/CMakeLists.txt	2013-12-01 08:27:41 UTC (rev 12792)
+++ trunk/cmake/epa_build/docbook-xml/CMakeLists.txt	2013-12-01 22:58:49 UTC (rev 12793)
@@ -1,178 +0,0 @@
-# Top-level CMakeLists.txt for the CMake-based build system
-# of the docbook-xml software.
-
-# Copyright (C) 2013 Alan W. Irwin
-
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; version 2 of the License.
-#
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this file; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-
-project(docbook-xml NONE)
-
-message(STATUS "CMake version = ${CMAKE_VERSION}")
-message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
-
-cmake_minimum_required(VERSION 2.8.10.2 FATAL_ERROR)
-
-# CATALOG_CMAKE_INSTALL_PREFIX prepends a "/" to CMAKE_INSTALL_PREFIX if the
-# latter doesn't start with "/", (i.e, the drive letter
-# on Microsoft systems).  This makes the URI file:/// form come out
-# right for catalog entries.
-if(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
-  set(CATALOG_CMAKE_INSTALL_PREFIX /${CMAKE_INSTALL_PREFIX})
-else(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
-  set(CATALOG_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-endif(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
-message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
-message(STATUS "CATALOG_CMAKE_INSTALL_PREFIX=${CATALOG_CMAKE_INSTALL_PREFIX}")
-
-# Define useful function.
-find_program(XMLCATALOG_EXECUTABLE xmlcatalog)
-function(install_xml_catalog arguments_LIST3 catalog)
-  # Install an XML catalog using the information supplied in
-  # arguments_LIST3, which is a list of arguments grouped by
-  # threes where each group of three arguments correspond to
-  # the three arguments of the "xmlcatalog --add" command.
-  
-  # Create the catalog if it does not exist.
-  install(CODE "
-if(NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
-message(STATUS \"Creating \${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
-execute_process(COMMAND ${XMLCATALOG_EXECUTABLE} --noout 
-  --create 
-  \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
-endif(NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
-")
-
-  list(LENGTH ${arguments_LIST3} narguments_LIST3)
-  set(group_size 3)
-  set(remove_indices 0 1 2)
-  math(EXPR max_index "(${narguments_LIST3}/${group_size}) - 1")
-  foreach(index RANGE 0 ${max_index})
-    list(GET ${arguments_LIST3} 0 type)
-    list(GET ${arguments_LIST3} 1 orig)
-    list(GET ${arguments_LIST3} 2 replace)
-    list(REMOVE_AT ${arguments_LIST3} ${remove_indices})
-    install(CODE "
-message(STATUS \"Updating \${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
-execute_process(COMMAND ${XMLCATALOG_EXECUTABLE} --noout
-  --add \"${type}\" \"${orig}\" \"${replace}\" 
-  \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
-"
-      )
-  endforeach(index RANGE 0 ${max_index})
-endfunction(install_xml_catalog)
-
-# Nothing to build.  Just follow directions at
-# http://www.linuxfromscratch.org/blfs/view/svn/pst/DocBook.html to
-# install files that are in the source tree.
-
-# Install top-level source tree files.
-set(globs
-  ${CMAKE_SOURCE_DIR}/docbook.cat
-  ${CMAKE_SOURCE_DIR}/*.dtd
-  ${CMAKE_SOURCE_DIR}/*.mod
-  )
-# Make elements of path_list absolute PATH names.
-file(GLOB path_list
-  ${globs}
-  )
-# Add the ent subdirectory to path_list
-list(APPEND path_list ${CMAKE_SOURCE_DIR}/ent)
-
-find_program(INSTALL_EXECUTABLE install)
-find_program(CP_EXECUTABLE cp)
-
-install(CODE "
-message(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5\")
-execute_process(
-COMMAND ${INSTALL_EXECUTABLE} -v -d -m755 
-\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5\")
-"
-  )
-
-install(CODE "
-execute_process(
-COMMAND ${CP_EXECUTABLE} -v -af ${path_list}
-\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5\")
-"
-  )
-
-install(CODE "
-message(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/etc/xml\")
-execute_process(
-COMMAND ${INSTALL_EXECUTABLE} -v -d -m755 
-\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml\")
-"
-  )
-
-set(commands
-"public" "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
-"public" "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/calstblx.dtd"
-"public" "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/soextblx.dtd"
-"public" "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod"
-"public" "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbhierx.mod"
-"public" "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/htmltblx.mod"
-"public" "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod"
-"public" "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbcentx.mod"
-"public" "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbgenent.mod"
-"rewriteSystem" "http://www.oasis-open.org/docbook/xml/4.5" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
-"rewriteURI" "http://www.oasis-open.org/docbook/xml/4.5" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5")
-
-install_xml_catalog(commands "docbook")
-
-# Do this for every pattern above so using the catalog file as the catalog
-# is equivalent to using the docbook file as the catalog.
-set(commands
-"delegatePublic" "-//OASIS//DTD DocBook XML" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
-"delegatePublic" "-//OASIS//DTD XML Exchange" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
-"delegatePublic" "-//OASIS//ENTITIES DocBook XML" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
-"delegatePublic" "-//OASIS//ELEMENTS DocBook XML" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
-"delegateSystem" "http://www.oasis-open.org/docbook/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
-"delegateURI" "http://www.oasis-open.org/docbook/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
-)
-
-install_xml_catalog(commands "catalog")
-
-# LFS instructions at 
-# http://www.linuxfromscratch.org/blfs/view/svn/pst/DocBook.html
-# are open to interpretation for this part, but I think it means
-# these previous versions should be dropped if they are handled
-# a different way.  But I am not doing that so leave them in
-# unless some issue is found in the future that I am not aware of
-# now.
-
-set(previous_versions
-  4.1.2
-  4.2
-  4.3
-  4.4
-  )
-
-foreach(DTDVERSION ${previous_versions})
-  set(commands
-    "public" "-//OASIS//DTD DocBook XML V${DTDVERSION}//EN" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/docbookx.dtd"
-    "rewriteSystem" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
-    "rewriteURI" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
-    )
-  install_xml_catalog(commands "docbook")
-
-  # Do this for every pattern above except the "public" one which has already
-  # been taken care of so using the catalog file as the catalog
-  # is equivalent to using the docbook file as the catalog.
-  set(commands
-    "delegateSystem" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
-    "delegateURI" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
-    )
-  install_xml_catalog(commands "catalog")
-
-endforeach(DTDVERSION ${previous_versions})
Modified: trunk/cmake/epa_build/docbook-xml/bp.cmake
===================================================================
--- trunk/cmake/epa_build/docbook-xml/bp.cmake	2013-12-01 08:27:41 UTC (rev 12792)
+++ trunk/cmake/epa_build/docbook-xml/bp.cmake	2013-12-01 22:58:49 UTC (rev 12793)
@@ -88,11 +88,11 @@
   OUTPUT
   ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-update
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}_CMakeLists.txt
   ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
   COMMENT "Custom updating of ${BP_PACKAGE}"
   DEPENDS
-  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}_CMakeLists.txt
   APPEND
   )
 
Copied: trunk/cmake/epa_build/docbook-xml/docbook-xml_CMakeLists.txt (from rev 12783, trunk/cmake/epa_build/docbook-xml/CMakeLists.txt)
===================================================================
--- trunk/cmake/epa_build/docbook-xml/docbook-xml_CMakeLists.txt	                        (rev 0)
+++ trunk/cmake/epa_build/docbook-xml/docbook-xml_CMakeLists.txt	2013-12-01 22:58:49 UTC (rev 12793)
@@ -0,0 +1,178 @@
+# Top-level CMakeLists.txt for the CMake-based build system
+# of the docbook-xml software.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; version 2 of the License.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+project(docbook-xml NONE)
+
+message(STATUS "CMake version = ${CMAKE_VERSION}")
+message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
+
+cmake_minimum_required(VERSION 2.8.10.2 FATAL_ERROR)
+
+# CATALOG_CMAKE_INSTALL_PREFIX prepends a "/" to CMAKE_INSTALL_PREFIX if the
+# latter doesn't start with "/", (i.e, the drive letter
+# on Microsoft systems).  This makes the URI file:/// form come out
+# right for catalog entries.
+if(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
+  set(CATALOG_CMAKE_INSTALL_PREFIX /${CMAKE_INSTALL_PREFIX})
+else(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
+  set(CATALOG_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+endif(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
+message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
+message(STATUS "CATALOG_CMAKE_INSTALL_PREFIX=${CATALOG_CMAKE_INSTALL_PREFIX}")
+
+# Define useful function.
+find_program(XMLCATALOG_EXECUTABLE xmlcatalog)
+function(install_xml_catalog arguments_LIST3 catalog)
+  # Install an XML catalog using the information supplied in
+  # arguments_LIST3, which is a list of arguments grouped by
+  # threes where each group of three arguments correspond to
+  # the three arguments of the "xmlcatalog --add" command.
+  
+  # Create the catalog if it does not exist.
+  install(CODE "
+if(NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+message(STATUS \"Creating \${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+execute_process(COMMAND ${XMLCATALOG_EXECUTABLE} --noout 
+  --create 
+  \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+endif(NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+")
+
+  list(LENGTH ${arguments_LIST3} narguments_LIST3)
+  set(group_size 3)
+  set(remove_indices 0 1 2)
+  math(EXPR max_index "(${narguments_LIST3}/${group_size}) - 1")
+  foreach(index RANGE 0 ${max_index})
+    list(GET ${arguments_LIST3} 0 type)
+    list(GET ${arguments_LIST3} 1 orig)
+    list(GET ${arguments_LIST3} 2 replace)
+    list(REMOVE_AT ${arguments_LIST3} ${remove_indices})
+    install(CODE "
+message(STATUS \"Updating \${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+execute_process(COMMAND ${XMLCATALOG_EXECUTABLE} --noout
+  --add \"${type}\" \"${orig}\" \"${replace}\" 
+  \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+"
+      )
+  endforeach(index RANGE 0 ${max_index})
+endfunction(install_xml_catalog)
+
+# Nothing to build.  Just follow directions at
+# http://www.linuxfromscratch.org/blfs/view/svn/pst/DocBook.html to
+# install files that are in the source tree.
+
+# Install top-level source tree files.
+set(globs
+  ${CMAKE_SOURCE_DIR}/docbook.cat
+  ${CMAKE_SOURCE_DIR}/*.dtd
+  ${CMAKE_SOURCE_DIR}/*.mod
+  )
+# Make elements of path_list absolute PATH names.
+file(GLOB path_list
+  ${globs}
+  )
+# Add the ent subdirectory to path_list
+list(APPEND path_list ${CMAKE_SOURCE_DIR}/ent)
+
+find_program(INSTALL_EXECUTABLE install)
+find_program(CP_EXECUTABLE cp)
+
+install(CODE "
+message(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5\")
+execute_process(
+COMMAND ${INSTALL_EXECUTABLE} -v -d -m755 
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5\")
+"
+  )
+
+install(CODE "
+execute_process(
+COMMAND ${CP_EXECUTABLE} -v -af ${path_list}
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5\")
+"
+  )
+
+install(CODE "
+message(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/etc/xml\")
+execute_process(
+COMMAND ${INSTALL_EXECUTABLE} -v -d -m755 
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml\")
+"
+  )
+
+set(commands
+"public" "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
+"public" "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/calstblx.dtd"
+"public" "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/soextblx.dtd"
+"public" "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod"
+"public" "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbhierx.mod"
+"public" "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/htmltblx.mod"
+"public" "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod"
+"public" "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbcentx.mod"
+"public" "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbgenent.mod"
+"rewriteSystem" "http://www.oasis-open.org/docbook/xml/4.5" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
+"rewriteURI" "http://www.oasis-open.org/docbook/xml/4.5" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5")
+
+install_xml_catalog(commands "docbook")
+
+# Do this for every pattern above so using the catalog file as the catalog
+# is equivalent to using the docbook file as the catalog.
+set(commands
+"delegatePublic" "-//OASIS//DTD DocBook XML" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegatePublic" "-//OASIS//DTD XML Exchange" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegatePublic" "-//OASIS//ENTITIES DocBook XML" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegatePublic" "-//OASIS//ELEMENTS DocBook XML" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegateSystem" "http://www.oasis-open.org/docbook/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegateURI" "http://www.oasis-open.org/docbook/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+)
+
+install_xml_catalog(commands "catalog")
+
+# LFS instructions at 
+# http://www.linuxfromscratch.org/blfs/view/svn/pst/DocBook.html
+# are open to interpretation for this part, but I think it means
+# these previous versions should be dropped if they are handled
+# a different way.  But I am not doing that so leave them in
+# unless some issue is found in the future that I am not aware of
+# now.
+
+set(previous_versions
+  4.1.2
+  4.2
+  4.3
+  4.4
+  )
+
+foreach(DTDVERSION ${previous_versions})
+  set(commands
+    "public" "-//OASIS//DTD DocBook XML V${DTDVERSION}//EN" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/docbookx.dtd"
+    "rewriteSystem" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
+    "rewriteURI" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
+    )
+  install_xml_catalog(commands "docbook")
+
+  # Do this for every pattern above except the "public" one which has already
+  # been taken care of so using the catalog file as the catalog
+  # is equivalent to using the docbook file as the catalog.
+  set(commands
+    "delegateSystem" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+    "delegateURI" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+    )
+  install_xml_catalog(commands "catalog")
+
+endforeach(DTDVERSION ${previous_versions})
Deleted: trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt	2013-12-01 08:27:41 UTC (rev 12792)
+++ trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt	2013-12-01 22:58:49 UTC (rev 12793)
@@ -1,180 +0,0 @@
-# Top-level CMakeLists.txt for the CMake-based build system
-# of the docbook-xsl software.
-
-# Copyright (C) 2013 Alan W. Irwin
-
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; version 2 of the License.
-#
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this file; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-
-project(docbook-xsl NONE)
-
-message(STATUS "CMake version = ${CMAKE_VERSION}")
-message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
-
-cmake_minimum_required(VERSION 2.8.10.2 FATAL_ERROR)
-
-# CATALOG_CMAKE_INSTALL_PREFIX prepends a "/" to CMAKE_INSTALL_PREFIX if the
-# latter doesn't start with "/", (i.e, the drive letter
-# on Microsoft systems).  This makes the URI file:/// form come out
-# right for catalog entries.
-if(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
-  set(CATALOG_CMAKE_INSTALL_PREFIX /${CMAKE_INSTALL_PREFIX})
-else(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
-  set(CATALOG_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-endif(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
-message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
-message(STATUS "CATALOG_CMAKE_INSTALL_PREFIX=${CATALOG_CMAKE_INSTALL_PREFIX}")
-
-# Define useful function.
-find_program(XMLCATALOG_EXECUTABLE xmlcatalog)
-function(install_xml_catalog arguments_LIST3 catalog)
-  # Install an XML catalog using the information supplied in
-  # arguments_LIST3, which is a list of arguments grouped by
-  # threes where each group of three arguments correspond to
-  # the three arguments of the "xmlcatalog --add" command.
-  
-  # Create the catalog if it does not exist.
-  install(CODE "
-if(NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
-message(STATUS \"Creating \${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
-execute_process(COMMAND ${XMLCATALOG_EXECUTABLE} --noout 
-  --create 
-  \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
-endif(NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
-")
-
-  list(LENGTH ${arguments_LIST3} narguments_LIST3)
-  set(group_size 3)
-  set(remove_indices 0 1 2)
-  math(EXPR max_index "(${narguments_LIST3}/${group_size}) - 1")
-  foreach(index RANGE 0 ${max_index})
-    list(GET ${arguments_LIST3} 0 type)
-    list(GET ${arguments_LIST3} 1 orig)
-    list(GET ${arguments_LIST3} 2 replace)
-    list(REMOVE_AT ${arguments_LIST3} ${remove_indices})
-    install(CODE "
-message(STATUS \"Updating \${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
-execute_process(COMMAND ${XMLCATALOG_EXECUTABLE} --noout
-  --add \"${type}\" \"${orig}\" \"${replace}\" 
-  \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
-"
-      )
-  endforeach(index RANGE 0 ${max_index})
-endfunction(install_xml_catalog)
-
-# Nothing to build.  Just follow directions at
-# http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html to
-# install files that are in the source tree.
-
-find_program(INSTALL_EXECUTABLE install)
-find_program(CP_EXECUTABLE cp)
-find_program(LN_EXECUTABLE ln)
-
-set(path_list
-  ${CMAKE_SOURCE_DIR}/VERSION
-  ${CMAKE_SOURCE_DIR}/common
-  ${CMAKE_SOURCE_DIR}/eclipse
-  ${CMAKE_SOURCE_DIR}/epub
-  ${CMAKE_SOURCE_DIR}/extensions
-  ${CMAKE_SOURCE_DIR}/fo
-  ${CMAKE_SOURCE_DIR}/highlighting
-  ${CMAKE_SOURCE_DIR}/html
-  ${CMAKE_SOURCE_DIR}/htmlhelp
-  ${CMAKE_SOURCE_DIR}/images
-  ${CMAKE_SOURCE_DIR}/javahelp
-  ${CMAKE_SOURCE_DIR}/lib
-  ${CMAKE_SOURCE_DIR}/manpages
-  ${CMAKE_SOURCE_DIR}/params
-  ${CMAKE_SOURCE_DIR}/profiling
-  ${CMAKE_SOURCE_DIR}/roundtrip
-  ${CMAKE_SOURCE_DIR}/slides
-  ${CMAKE_SOURCE_DIR}/template
-  ${CMAKE_SOURCE_DIR}/tests
-  ${CMAKE_SOURCE_DIR}/tools
-  ${CMAKE_SOURCE_DIR}/webhelp
-  ${CMAKE_SOURCE_DIR}/website
-  ${CMAKE_SOURCE_DIR}/xhtml
-  ${CMAKE_SOURCE_DIR}/xhtml-1_1
-)
-
-install(CODE "
-message(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1\")
-execute_process(
-COMMAND ${INSTALL_EXECUTABLE} -v -d -m755 
-\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1\")
-"
-  )
-
-install(CODE "
-execute_process(
-COMMAND ${CP_EXECUTABLE} -v -R ${path_list}
-\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1\")
-"
-  )
-
-install(CODE "
-execute_process(
-COMMAND ${LN_EXECUTABLE} -s VERSION
-\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl\")
-"
-  )
-
-install(CODE "
-execute_process(
-COMMAND ${INSTALL_EXECUTABLE} -v -m644 -D ${CMAKE_SOURCE_DIR}/README
-\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/doc/docbook-xsl-1.78.1/README.txt\")
-"
-  )
-
-set(globs
-  ${CMAKE_SOURCE_DIR}/RELEASE-NOTES*
-  ${CMAKE_SOURCE_DIR}/NEWS*
-  )
-# Make elements of path_list absolute PATH names.
-file(GLOB path_list
-  ${globs}
-  )
-install(CODE "
-execute_process(
-COMMAND ${INSTALL_EXECUTABLE} -v -m644 ${path_list}
-\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/doc/docbook-xsl-1.78.1\")
-"
-  )
-
-install(CODE "
-message(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/etc/xml\")
-execute_process(
-COMMAND ${INSTALL_EXECUTABLE} -v -d -m755 
-\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml\")
-"
-  )
-
-set(commands
-  "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/1.78.1" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
-  "rewriteURI" "http://docbook.sourceforge.net/release/xsl/1.78.1" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
-  "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/current" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
-  "rewriteURI" "http://docbook.sourceforge.net/release/xsl/current" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
-)
-
-install_xml_catalog(commands "catalog")
-
-# LFS instructions at
-# http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html
-# state what to do if other previous versions of docbook-xsl are
-# required.  Essentially, the steps are to install the older
-# docbook-xsl package as well, then run xmlcatalog --add <type> <orig>
-# <replace> where <type> is first rewriteSystem then rewriteURI.  Note
-# it is a different scenario then what is done for docbook-xml where
-# old versions of docbook-xml do not have to be installed.  With luck,
-# we won't need to install different versions of docbook-xsl so ignore
-# these docbook-xsl multiversion instructions for now.
Modified: trunk/cmake/epa_build/docbook-xsl/bp.cmake
===================================================================
--- trunk/cmake/epa_build/docbook-xsl/bp.cmake	2013-12-01 08:27:41 UTC (rev 12792)
+++ trunk/cmake/epa_build/docbook-xsl/bp.cmake	2013-12-01 22:58:49 UTC (rev 12793)
@@ -88,11 +88,11 @@
   OUTPUT
   ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-update
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}_CMakeLists.txt
   ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
   COMMENT "Custom updating of ${BP_PACKAGE}"
   DEPENDS
-  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}_CMakeLists.txt
   APPEND
   )
 
Copied: trunk/cmake/epa_build/docbook-xsl/docbook-xsl_CMakeLists.txt (from rev 12783, trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt)
===================================================================
--- trunk/cmake/epa_build/docbook-xsl/docbook-xsl_CMakeLists.txt	                        (rev 0)
+++ trunk/cmake/epa_build/docbook-xsl/docbook-xsl_CMakeLists.txt	2013-12-01 22:58:49 UTC (rev 12793)
@@ -0,0 +1,180 @@
+# Top-level CMakeLists.txt for the CMake-based build system
+# of the docbook-xsl software.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; version 2 of the License.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+project(docbook-xsl NONE)
+
+message(STATUS "CMake version = ${CMAKE_VERSION}")
+message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
+
+cmake_minimum_required(VERSION 2.8.10.2 FATAL_ERROR)
+
+# CATALOG_CMAKE_INSTALL_PREFIX prepends a "/" to CMAKE_INSTALL_PREFIX if the
+# latter doesn't start with "/", (i.e, the drive letter
+# on Microsoft systems).  This makes the URI file:/// form come out
+# right for catalog entries.
+if(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
+  set(CATALOG_CMAKE_INSTALL_PREFIX /${CMAKE_INSTALL_PREFIX})
+else(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
+  set(CATALOG_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+endif(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
+message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
+message(STATUS "CATALOG_CMAKE_INSTALL_PREFIX=${CATALOG_CMAKE_INSTALL_PREFIX}")
+
+# Define useful function.
+find_program(XMLCATALOG_EXECUTABLE xmlcatalog)
+function(install_xml_catalog arguments_LIST3 catalog)
+  # Install an XML catalog using the information supplied in
+  # arguments_LIST3, which is a list of arguments grouped by
+  # threes where each group of three arguments correspond to
+  # the three arguments of the "xmlcatalog --add" command.
+  
+  # Create the catalog if it does not exist.
+  install(CODE "
+if(NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+message(STATUS \"Creating \${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+execute_process(COMMAND ${XMLCATALOG_EXECUTABLE} --noout 
+  --create 
+  \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+endif(NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+")
+
+  list(LENGTH ${arguments_LIST3} narguments_LIST3)
+  set(group_size 3)
+  set(remove_indices 0 1 2)
+  math(EXPR max_index "(${narguments_LIST3}/${group_size}) - 1")
+  foreach(index RANGE 0 ${max_index})
+    list(GET ${arguments_LIST3} 0 type)
+    list(GET ${arguments_LIST3} 1 orig)
+    list(GET ${arguments_LIST3} 2 replace)
+    list(REMOVE_AT ${arguments_LIST3} ${remove_indices})
+    install(CODE "
+message(STATUS \"Updating \${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+execute_process(COMMAND ${XMLCATALOG_EXECUTABLE} --noout
+  --add \"${type}\" \"${orig}\" \"${replace}\" 
+  \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+"
+      )
+  endforeach(index RANGE 0 ${max_index})
+endfunction(install_xml_catalog)
+
+# Nothing to build.  Just follow directions at
+# http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html to
+# install files that are in the source tree.
+
+find_program(INSTALL_EXECUTABLE install)
+find_program(CP_EXECUTABLE cp)
+find_program(LN_EXECUTABLE ln)
+
+set(path_list
+  ${CMAKE_SOURCE_DIR}/VERSION
+  ${CMAKE_SOURCE_DIR}/common
+  ${CMAKE_SOURCE_DIR}/eclipse
+  ${CMAKE_SOURCE_DIR}/epub
+  ${CMAKE_SOURCE_DIR}/extensions
+  ${CMAKE_SOURCE_DIR}/fo
+  ${CMAKE_SOURCE_DIR}/highlighting
+  ${CMAKE_SOURCE_DIR}/html
+  ${CMAKE_SOURCE_DIR}/htmlhelp
+  ${CMAKE_SOURCE_DIR}/images
+  ${CMAKE_SOURCE_DIR}/javahelp
+  ${CMAKE_SOURCE_DIR}/lib
+  ${CMAKE_SOURCE_DIR}/manpages
+  ${CMAKE_SOURCE_DIR}/params
+  ${CMAKE_SOURCE_DIR}/profiling
+  ${CMAKE_SOURCE_DIR}/roundtrip
+  ${CMAKE_SOURCE_DIR}/slides
+  ${CMAKE_SOURCE_DIR}/template
+  ${CMAKE_SOURCE_DIR}/tests
+  ${CMAKE_SOURCE_DIR}/tools
+  ${CMAKE_SOURCE_DIR}/webhelp
+  ${CMAKE_SOURCE_DIR}/website
+  ${CMAKE_SOURCE_DIR}/xhtml
+  ${CMAKE_SOURCE_DIR}/xhtml-1_1
+)
+
+install(CODE "
+message(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1\")
+execute_process(
+COMMAND ${INSTALL_EXECUTABLE} -v -d -m755 
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1\")
+"
+  )
+
+install(CODE "
+execute_process(
+COMMAND ${CP_EXECUTABLE} -v -R ${path_list}
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1\")
+"
+  )
+
+install(CODE "
+execute_process(
+COMMAND ${LN_EXECUTABLE} -s VERSION
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl\")
+"
+  )
+
+install(CODE "
+execute_process(
+COMMAND ${INSTALL_EXECUTABLE} -v -m644 -D ${CMAKE_SOURCE_DIR}/README
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/doc/docbook-xsl-1.78.1/README.txt\")
+"
+  )
+
+set(globs
+  ${CMAKE_SOURCE_DIR}/RELEASE-NOTES*
+  ${CMAKE_SOURCE_DIR}/NEWS*
+  )
+# Make elements of path_list absolute PATH names.
+file(GLOB path_list
+  ${globs}
+  )
+install(CODE "
+execute_process(
+COMMAND ${INSTALL_EXECUTABLE} -v -m644 ${path_list}
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/doc/docbook-xsl-1.78.1\")
+"
+  )
+
+install(CODE "
+message(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/etc/xml\")
+execute_process(
+COMMAND ${INSTALL_EXECUTABLE} -v -d -m755 
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml\")
+"
+  )
+
+set(commands
+  "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/1.78.1" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
+  "rewriteURI" "http://docbook.sourceforge.net/release/xsl/1.78.1" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
+  "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/current" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
+  "rewriteURI" "http://docbook.sourceforge.net/release/xsl/current" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
+)
+
+install_xml_catalog(commands "catalog")
+
+# LFS instructions at
+# http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html
+# state what to do if other previous versions of docbook-xsl are
+# required.  Essentially, the steps are to install the older
+# docbook-xsl package as well, then run xmlcatalog --add <type> <orig>
+# <replace> where <type> is first rewriteSystem then rewriteURI.  Note
+# it is a different scenario then what is done for docbook-xml where
+# old versions of docbook-xml do not have to be installed.  With luck,
+# we won't need to install different versions of docbook-xsl so ignore
+# these docbook-xsl multiversion instructions for now.
Deleted: trunk/cmake/epa_build/iwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/iwidgets/CMakeLists.txt	2013-12-01 08:27:41 UTC (rev 12792)
+++ trunk/cmake/epa_build/iwidgets/CMakeLists.txt	2013-12-01 22:58:49 UTC (rev 12793)
@@ -1,149 +0,0 @@
-# Top-level CMakeLists.txt for the CMake-based build and test system
-# of the iwidgets software.
-
-# Copyright (C) 2013 Alan W. Irwin
-
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; version 2 of the License.
-#
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this file; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-
-# The traditional autoconf build of iwidgets that was created in 2002
-# or earlier is completely broken and difficult to understand because
-# lots of the install is done in a low-level way.
-# Therefore, this is an attempt to replace that build system with a
-# rational CMake-based build system that actually works.
-
-# N.B. This "build" system only installs files so
-# no compiler is required for this project
-project(iwidgets NONE)
-
-message(STATUS "CMake version = ${CMAKE_VERSION}")
-message(STATUS "CMAKE_SYSTEM = ${CMAKE_SYSTEM}")
-message(STATUS "CMAKE_GENERATOR = ${CMAKE_GENERATOR}")
-message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
-
-cmake_minimum_required(VERSION 2.8.11.2 FATAL_ERROR)
-
-option(BUILD_IWIDGETS_4.1 "Build iwidgets 4.1" OFF)
-
-if(BUILD_IWIDGETS_4.1)
-  # install iwidgets 4.1 that is associated with version 4 of itcl and itk.
-  # Note the only difference between iwidgets 4.1 and 4.0 source code
-  # is a small patch.  We assume that patch has been applied for this case.
-  set(ITCL_VERSION 4.0)
-  set(VERSION 4.1.0)
-else(BUILD_IWIDGETS_4.1)
-  # install iwidgets 4.0 that is associated with version 3 of itcl and itk.
-  set(ITCL_VERSION 3.2)
-  set(VERSION 4.0.1)
-endif(BUILD_IWIDGETS_4.1)
-
-set(PACKAGE iwidgets${VERSION})
-
-# Set up install locations.
-set(
-  CMAKE_INSTALL_SCRIPTS_DIR
-  ${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}
-  CACHE PATH "install location for iwidgets scripts."
-  )
-
-set(
-  CMAKE_INSTALL_DOC_DIR
-  ${CMAKE_INSTALL_PREFIX}/share/doc/${PACKAGE}
-  CACHE PATH "install location for iwidgets scripts."
-  )
-
-set(
-  CMAKE_INSTALL_MAN_DIR
-  ${CMAKE_INSTALL_PREFIX}/share/man
-  CACHE PATH "install location for man documentation"
-  )
-
-# Install configured iwidgets.tcl and pkgIndex.tcl.
-configure_file(iwidgets.tcl.in iwidgets.tcl @ONLY)
-configure_file(pkgIndex.tcl.in pkgIndex.tcl @ONLY)
-install(
-  FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/iwidgets.tcl 
-  ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl
-  DESTINATION ${CMAKE_INSTALL_SCRIPTS_DIR}
-  )
-
-# Install selected files from the generic subdirectory.
-
-file(GLOB generic_FILE_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} generic/*.itk generic/*.itcl generic/tclIndex generic/*.gif)
-install(
-  FILES
-  ${generic_FILE_LIST}
-  DESTINATION ${CMAKE_INSTALL_SCRIPTS_DIR}/scripts
-  )
-
-# Install some individual files to the documentation directory.
-install(
-  FILES
-  CHANGES ChangeLog README license.terms
-  DESTINATION ${CMAKE_INSTALL_DOC_DIR}
-  )
-
-
-# Install demos, demos/images, and demos/html.
-
-file(GLOB demos_FILE_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} demos/*)
-list(REMOVE_ITEM demos_FILE_LIST demos/images demos/html)
-install(
-  FILES
-  ${demos_FILE_LIST}
-  DESTINATION ${CMAKE_INSTALL_DOC_DIR}/demos
-  )
-
-file(GLOB demos_images_FILE_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} demos/images/*)
-install(
-  FILES
-  ${demos_images_FILE_LIST}
-  DESTINATION ${CMAKE_INSTALL_DOC_DIR}/demos/images
-  )
-file(GLOB demos_html_FILE_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} demos/html/*)
-install(
-  FILES
-  ${demos_html_FILE_LIST}
-  DESTINATION ${CMAKE_INSTALL_DOC_DIR}/demos/html
-  )
-
-# Install transformed man pages using "iwidgets_" filename suffix.
-# (All these changes copied exactly from the traditional build system
-# except that I use default 644 permissions [which is consistent
-# with the permissions of Debian man pages].)
-
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc)
-
-find_program(SED_EXECUTABLE sed)
-if(NOT SED_EXECUTABLE)
-  message(FATAL_ERROR "sed required for build but not found")
-endif(NOT SED_EXECUTABLE)
-
-file(GLOB man_FILE_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} doc/*.n)
-foreach(manpage ${man_FILE_LIST})
-  string(REGEX REPLACE "^doc/" "doc/iwidgets_" processed_manpage ${manpage})
-  execute_process(
-    COMMAND
-    ${SED_EXECUTABLE} -e "/man\\.macros/r ${CMAKE_CURRENT_SOURCE_DIR}/doc/man.macros" -e "/man\\.macros/d"
-    INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${manpage} 
-    OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${processed_manpage}
-    )
-endforeach(manpage ${man_FILE_LIST})
-
-file(GLOB man_FILE_LIST ${CMAKE_CURRENT_BINARY_DIR}/doc/*.n)
-install(
-  FILES
-  ${man_FILE_LIST}
-  DESTINATION ${CMAKE_INSTALL_MAN_DIR}/mann
-  )
Modified: trunk/cmake/epa_build/iwidgets/bp.cmake
===================================================================
--- trunk/cmake/epa_build/iwidgets/bp.cmake	2013-12-01 08:27:41 UTC (rev 12792)
+++ trunk/cmake/epa_build/iwidgets/bp.cmake	2013-12-01 22:58:49 UTC (rev 12793)
@@ -132,7 +132,7 @@
     ${EP_BASE}/Stamp/build_${BP_PACKAGE}${tag}/build_${BP_PACKAGE}${tag}-patch
     COMMAND echo "Add CMake-based build system"
     COMMAND ${CMAKE_COMMAND} -E copy_if_different 
-    ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+    ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}_CMakeLists.txt
     ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}/CMakeLists.txt
     APPEND
       )
Copied: trunk/cmake/epa_build/iwidgets/iwidgets_CMakeLists.txt (from rev 12783, trunk/cmake/epa_build/iwidgets/CMakeLists.txt)
===================================================================
--- trunk/cmake/epa_build/iwidgets/iwidgets_CMakeLists.txt	                        (rev 0)
+++ trunk/cmake/epa_build/iwidgets/iwidgets_CMakeLists.txt	2013-12-01 22:58:49 UTC (rev 12793)
@@ -0,0 +1,149 @@
+# Top-level CMakeLists.txt for the CMake-based build and test system
+# of the iwidgets software.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; version 2 of the License.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+# The traditional autoconf build of iwidgets that was created in 2002
+# or earlier is completely broken and difficult to understand because
+# lots of the install is done in a low-level way.
+# Therefore, this is an attempt to replace that build system with a
+# rational CMake-based build system that actually works.
+
+# N.B. This "build" system only installs files so
+# no compiler is required for this project
+project(iwidgets NONE)
+
+message(STATUS "CMake version = ${CMAKE_VERSION}")
+message(STATUS "CMAKE_SYSTEM = ${CMAKE_SYSTEM}")
+message(STATUS "CMAKE_GENERATOR = ${CMAKE_GENERATOR}")
+message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
+
+cmake_minimum_required(VERSION 2.8.11.2 FATAL_ERROR)
+
+option(BUILD_IWIDGETS_4.1 "Build iwidgets 4.1" OFF)
+
+if(BUILD_IWIDGETS_4.1)
+  # install iwidgets 4.1 that is associated with version 4 of itcl and itk.
+  # Note the only difference between iwidgets 4.1 and 4.0 source code
+  # is a small patch.  We assume that patch has been applied for this case.
+  set(ITCL_VERSION 4.0)
+  set(VERSION 4.1.0)
+else(BUILD_IWIDGETS_4.1)
+  # install iwidgets 4.0 that is associated with version 3 of itcl and itk.
+  set(ITCL_VERSION 3.2)
+  set(VERSION 4.0.1)
+endif(BUILD_IWIDGETS_4.1)
+
+set(PACKAGE iwidgets${VERSION})
+
+# Set up install locations.
+set(
+  CMAKE_INSTALL_SCRIPTS_DIR
+  ${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}
+  CACHE PATH "install location for iwidgets scripts."
+  )
+
+set(
+  CMAKE_INSTALL_DOC_DIR
+  ${CMAKE_INSTALL_PREFIX}/share/doc/${PACKAGE}
+  CACHE PATH "install location for iwidgets scripts."
+  )
+
+set(
+  CMAKE_INSTALL_MAN_DIR
+  ${CMAKE_INSTALL_PREFIX}/share/man
+  CACHE PATH "install location for man documentation"
+  )
+
+# Install configured iwidgets.tcl and pkgIndex.tcl.
+configure_file(iwidgets.tcl.in iwidgets.tcl @ONLY)
+configure_file(pkgIndex.tcl.in pkgIndex.tcl @ONLY)
+install(
+  FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/iwidgets.tcl 
+  ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl
+  DESTINATION ${CMAKE_INSTALL_SCRIPTS_DIR}
+  )
+
+# Install selected files from the generic subdirectory.
+
+file(GLOB generic_FILE_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} generic/*.itk generic/*.itcl generic/tclIndex generic/*.gif)
+install(
+  FILES
+  ${generic_FILE_LIST}
+  DESTINATION ${CMAKE_INSTALL_SCRIPTS_DIR}/scripts
+  )
+
+# Install some individual files to the documentation directory.
+install(
+  FILES
+  CHANGES ChangeLog README license.terms
+  DESTINATION ${CMAKE_INSTALL_DOC_DIR}
+  )
+
+
+# Install demos, demos/images, and demos/html.
+
+file(GLOB demos_FILE_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} demos/*)
+list(REMOVE_ITEM demos_FILE_LIST demos/images demos/html)
+install(
+  FILES
+  ${demos_FILE_LIST}
+  DESTINATION ${CMAKE_INSTALL_DOC_DIR}/demos
+  )
+
+file(GLOB demos_images_FILE_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} demos/images/*)
+install(
+  FILES
+  ${demos_images_FILE_LIST}
+  DESTINATION ${CMAKE_INSTALL_DOC_DIR}/demos/images
+  )
+file(GLOB demos_html_FILE_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} demos/html/*)
+install(
+  FILES
+  ${demos_html_FILE_LIST}
+  DESTINATION ${CMAKE_INSTALL_DOC_DIR}/demos/html
+  )
+
+# Install transformed man pages using "iwidgets_" filename suffix.
+# (All these changes copied exactly from the traditional build system
+# except that I use default 644 permissions [which is consistent
+# with the permissions of Debian man pages].)
+
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc)
+
+find_program(SED_EXECUTABLE sed)
+if(NOT SED_EXECUTABLE)
+  message(FATAL_ERROR "sed required for build but not found")
+endif(NOT SED_EXECUTABLE)
+
+file(GLOB man_FILE_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} doc/*.n)
+foreach(manpage ${man_FILE_LIST})
+  string(REGEX REPLACE "^doc/" "doc/iwidgets_" processed_manpage ${manpage})
+  execute_process(
+    COMMAND
+    ${SED_EXECUTABLE} -e "/man\\.macros/r ${CMAKE_CURRENT_SOURCE_DIR}/doc/man.macros" -e "/man\\.macros/d"
+    INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${manpage} 
+    OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${processed_manpage}
+    )
+endforeach(manpage ${man_FILE_LIST})
+
+file(GLOB man_FILE_LIST ${CMAKE_CURRENT_BINARY_DIR}/doc/*.n)
+install(
+  FILES
+  ${man_FILE_LIST}
+  DESTINATION ${CMAKE_INSTALL_MAN_DIR}/mann
+  )
Deleted: trunk/cmake/epa_build/libagg/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libagg/CMakeLists.txt	2013-12-01 08:27:41 UTC (rev 12792)
+++ trunk/cmake/epa_build/libagg/CMakeLists.txt	2013-12-01 22:58:49 UTC (rev 12793)
@@ -1,250 +0,0 @@
-# Top-level CMakeLists.txt for the CMake-based build and test system
-# of the AGG (Anti-Grain Geometry) library.
-
-# Copyright (C) 2006 Werner Smekal
-# Copyright (C) 2013 Alan W. Irwin
-
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; version 2 of the License.
-#
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this file; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-
-# CMakeLists.txt for the agg 2.5 library.  (AWI has double-checked that
-# the agg_LIB_SRCS and agg_LIB_HDRS lists below are consistent with that
-# version of agg.)
-# This build system currently
-# only makes the agg library (static/shared) but no executables
-# Put this file in the main directory, create and cd into a build directory,
-# and run this cmake command:
-#    cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=../local ..
-# or similar.
-
-# It is a fatal error if no working C++ compiler is available to build
-# the shapelib library and utilities
-project(shapelib CXX)
-
-message(STATUS "CMake version = ${CMAKE_VERSION}")
-message(STATUS "CMAKE_SYSTEM = ${CMAKE_SYSTEM}")
-message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
-
-cmake_minimum_required(VERSION 2.8.10.2 FATAL_ERROR)
-
-# libraries are all shared by default.
-option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-
-set(
-  agg_LIB_SRCS
-    src/agg_arc.cpp
-    src/agg_arrowhead.cpp
-    src/agg_bezier_arc.cpp
-    src/agg_bspline.cpp
-    src/agg_curves.cpp
-    src/agg_vcgen_contour.cpp
-    src/agg_vcgen_dash.cpp
-    src/agg_vcgen_markers_term.cpp
-    src/agg_vcgen_smooth_poly1.cpp
-    src/agg_vcgen_stroke.cpp
-    src/agg_vcgen_bspline.cpp
-    src/agg_gsv_text.cpp
-    src/agg_image_filters.cpp
-    src/agg_line_aa_basics.cpp
-    src/agg_line_profile_aa.cpp
-    src/agg_rounded_rect.cpp
-    src/agg_sqrt_tables.cpp
-    src/agg_embedded_raster_fonts.cpp
-    src/agg_trans_affine.cpp
-    src/agg_trans_warp_magnifier.cpp
-    src/agg_trans_single_path.cpp
-    src/agg_trans_double_path.cpp
-    src/agg_vpgen_clip_polygon.cpp
-    src/agg_vpgen_clip_polyline.cpp
-    src/agg_vpgen_segmentator.cpp
-    src/ctrl/agg_cbox_ctrl.cpp
-    src/ctrl/agg_gamma_ctrl.cpp
-    src/ctrl/agg_gamma_spline.cpp
-    src/ctrl/agg_rbox_ctrl.cpp
-    src/ctrl/agg_slider_ctrl.cpp
-    src/ctrl/agg_spline_ctrl.cpp
-    src/ctrl/agg_scale_ctrl.cpp
-    src/ctrl/agg_polygon_ctrl.cpp
-    src/ctrl/agg_bezier_ctrl.cpp
-    gpc/gpc.c
-)
-
-set(
-  agg_LIB_HDRS
-    include/agg_alpha_mask_u8.h
-    include/agg_arc.h
-    include/agg_array.h
-    include/agg_arrowhead.h
-    include/agg_basics.h
-    include/agg_bezier_arc.h
-    include/agg_bitset_iterator.h
-    include/agg_blur.h
-    include/agg_bounding_rect.h
-    include/agg_bspline.h
-    include/agg_clip_liang_barsky.h
-    include/agg_color_gray.h
-    include/agg_color_rgba.h
-    include/agg_config.h
-    include/agg_conv_adaptor_vcgen.h
-    include/agg_conv_adaptor_vpgen.h
-    include/agg_conv_bspline.h
-    include/agg_conv_clip_polygon.h
-    include/agg_conv_clip_polyline.h
-    include/agg_conv_close_polygon.h
-    include/agg_conv_concat.h
-    include/agg_conv_contour.h
-    include/agg_conv_curve.h
-    include/agg_conv_dash.h
-    include/agg_conv_gpc.h
-    include/agg_conv_marker.h
-    include/agg_conv_marker_adaptor.h
-    include/agg_conv_segmentator.h
-    include/agg_conv_shorten_path.h
-    include/agg_conv_smooth_poly1.h
-    include/agg_conv_stroke.h
-    include/agg_conv_transform.h
-    include/agg_conv_unclose_polygon.h
-    include/agg_curves.h
-    include/agg_dda_line.h
-    include/agg_ellipse.h
-    include/agg_ellipse_bresenham.h
-    include/agg_embedded_raster_fonts.h
-    include/agg_font_cache_manager.h
-    include/agg_gamma_functions.h
-    include/agg_gamma_lut.h
-    include/agg_glyph_raster_bin.h
-    include/agg_gradient_lut.h
-    include/agg_gsv_text.h
-    include/agg_image_accessors.h
-    include/agg_image_filters.h
-    include/agg_line_aa_basics.h
-    include/agg_math.h
-    include/agg_math_stroke.h
-    include/agg_path_length.h
-    include/agg_path_storage.h
-    include/agg_path_storage_integer.h
-    include/agg_pattern_filters_rgba.h
-    include/agg_pixfmt_amask_adaptor.h
-    include/agg_pixfmt_gray.h
-    include/agg_pixfmt_rgb.h
-    include/agg_pixfmt_rgb_packed.h
-    include/agg_pixfmt_rgba.h
-    include/agg_pixfmt_transposer.h
-    include/agg_rasterizer_cells_aa.h
-    include/agg_rasterizer_compound_aa.h
-    include/agg_rasterizer_outline.h
-    include/agg_rasterizer_outline_aa.h
-    include/agg_rasterizer_scanline_aa.h
-    include/agg_rasterizer_sl_clip.h
-    include/agg_renderer_base.h
-    include/agg_renderer_markers.h
-    include/agg_renderer_mclip.h
-    include/agg_renderer_outline_aa.h
-    include/agg_renderer_outline_image.h
-    include/agg_renderer_primitives.h
-    include/agg_renderer_raster_text.h
-    include/agg_renderer_scanline.h
-    include/agg_rendering_buffer.h
-    include/agg_rendering_buffer_dynarow.h
-    include/agg_rounded_rect.h
-    include/agg_scanline_bin.h
-    include/agg_scanline_boolean_algebra.h
-    include/agg_scanline_p.h
-    include/agg_scanline_storage_aa.h
-    include/agg_scanline_storage_bin.h
-    include/agg_scanline_u.h
-    include/agg_shorten_path.h
-    include/agg_simul_eq.h
-    include/agg_span_allocator.h
-    include/agg_span_converter.h
-    include/agg_span_gouraud.h
-    include/agg_span_gouraud_gray.h
-    include/agg_span_gouraud_rgba.h
-    include/agg_span_gradient.h
-    include/agg_span_gradient_alpha.h
-    include/agg_span_image_filter.h
-    include/agg_span_image_filter_gray.h
-    include/agg_span_image_filter_rgb.h
-    include/agg_span_image_filter_rgba.h
-    include/agg_span_interpolator_adaptor.h
-    include/agg_span_interpolator_linear.h
-    include/agg_span_interpolator_persp.h
-    include/agg_span_interpolator_trans.h
-    include/agg_span_pattern_gray.h
-    include/agg_span_pattern_rgb.h
-    include/agg_span_pattern_rgba.h
-    include/agg_span_solid.h
-    include/agg_span_subdiv_adaptor.h
-    include/agg_trans_affine.h
-    include/agg_trans_bilinear.h
-    include/agg_trans_double_path.h
-    include/agg_trans_perspective.h
-    include/agg_trans_single_path.h
-    include/agg_trans_viewport.h
-    include/agg_trans_warp_magnifier.h
-    include/agg_vcgen_bspline.h
-    include/agg_vcgen_contour.h
-    include/agg_vcgen_dash.h
-    include/agg_vcgen_markers_term.h
-    include/agg_vcgen_smooth_poly1.h
-    include/agg_vcgen_stroke.h
-    include/agg_vcgen_vertex_sequence.h
-    include/agg_vertex_sequence.h
-    include/agg_vpgen_clip_polygon.h
-    include/agg_vpgen_clip_polyline.h
-    include/agg_vpgen_segmentator.h
-    include/ctrl/agg_bezier_ctrl.h
-    include/ctrl/agg_cbox_ctrl.h
-    include/ctrl/agg_ctrl.h
-    include/ctrl/agg_gamma_ctrl.h
-    include/ctrl/agg_gamma_spline.h
-    include/ctrl/agg_polygon_ctrl.h
-    include/ctrl/agg_rbox_ctrl.h
-    include/ctrl/agg_scale_ctrl.h
-    include/ctrl/agg_slider_ctrl.h
-    include/ctrl/agg_spline_ctrl.h
-    include/util/agg_color_conv.h
-    include/util/agg_color_conv_rgb16.h
-    include/util/agg_color_conv_rgb8.h
-    include/platform/agg_platform_support.h
-    include/platform/mac/agg_mac_pmap.h
-    include/platform/win32/agg_win32_bmp.h
-)
-
-INCLUDE_DIRECTORIES(
-  include
-)
-
-
-ADD_LIBRARY(
-  agg
-  ${agg_LIB_SRCS}
-)
-
-INSTALL(
-  TARGETS
-    agg
-  ARCHIVE DESTINATION 
-    lib
-  LIBRARY DESTINATION 
-    lib
-  RUNTIME DESTINATION
-    bin
-)
-
-INSTALL(
-  FILES
-    ${agg_LIB_HDRS}
-  DESTINATION
-    include/agg2
-)
Modified: trunk/cmake/epa_build/libagg/bp.cmake
===================================================================
--- trunk/cmake/epa_build/libagg/bp.cmake	2013-12-01 08:27:41 UTC (rev 12792)
+++ trunk/cmake/epa_build/libagg/bp.cmake	2013-12-01 22:58:49 UTC (rev 12793)
@@ -58,11 +58,11 @@
   OUTPUT
   ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-update
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}_CMakeLists.txt
   ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
   COMMENT "Custom updating of ${BP_PACKAGE}"
   DEPENDS
-  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}_CMakeLists.txt
   APPEND
   )
 
Copied: trunk/cmake/epa_build/libagg/libagg_CMakeLists.txt (from rev 12783, trunk/cmake/epa_build/libagg/CMakeLists.txt)
===================================================================
--- trunk/cmake/epa_build/libagg/libagg_CMakeLists.txt	                        (rev 0)
+++ trunk/cmake/epa_build/libagg/libagg_CMakeLists.txt	2013-12-01 22:58:49 UTC (rev 12793)
@@ -0,0 +1,250 @@
+# Top-level CMakeLists.txt for the CMake-based build and test system
+# of the AGG (Anti-Grain Geometry) library.
+
+# Copyright (C) 2006 Werner Smekal
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; version 2 of the License.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+# CMakeLists.txt for the agg 2.5 library.  (AWI has double-checked that
+# the agg_LIB_SRCS and agg_LIB_HDRS lists below are consistent with that
+# version of agg.)
+# This build system currently
+# only makes the agg library (static/shared) but no executables
+# Put this file in the main directory, create and cd into a build directory,
+# and run this cmake command:
+#    cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=../local ..
+# or similar.
+
+# It is a fatal error if no working C++ compiler is available to build
+# the shapelib library and utilities
+project(shapelib CXX)
+
+message(STATUS "CMake version = ${CMAKE_VERSION}")
+message(STATUS "CMAKE_SYSTEM = ${CMAKE_SYSTEM}")
+message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
+
+cmake_minimum_required(VERSION 2.8.10.2 FATAL_ERROR)
+
+# libraries are all shared by default.
+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+
+set(
+  agg_LIB_SRCS
+    src/agg_arc.cpp
+    src/agg_arrowhead.cpp
+    src/agg_bezier_arc.cpp
+    src/agg_bspline.cpp
+    src/agg_curves.cpp
+    src/agg_vcgen_contour.cpp
+    src/agg_vcgen_dash.cpp
+    src/agg_vcgen_markers_term.cpp
+    src/agg_vcgen_smooth_poly1.cpp
+    src/agg_vcgen_stroke.cpp
+    src/agg_vcgen_bspline.cpp
+    src/agg_gsv_text.cpp
+    src/agg_image_filters.cpp
+    src/agg_line_aa_basics.cpp
+    src/agg_line_profile_aa.cpp
+    src/agg_rounded_rect.cpp
+    src/agg_sqrt_tables.cpp
+    src/agg_embedded_raster_fonts.cpp
+    src/agg_trans_affine.cpp
+    src/agg_trans_warp_magnifier.cpp
+    src/agg_trans_single_path.cpp
+    src/agg_trans_double_path.cpp
+    src/agg_vpgen_clip_polygon.cpp
+    src/agg_vpgen_clip_polyline.cpp
+    src/agg_vpgen_segmentator.cpp
+    src/ctrl/agg_cbox_ctrl.cpp
+    src/ctrl/agg_gamma_ctrl.cpp
+    src/ctrl/agg_gamma_spline.cpp
+    src/ctrl/agg_rbox_ctrl.cpp
+    src/ctrl/agg_slider_ctrl.cpp
+    src/ctrl/agg_spline_ctrl.cpp
+    src/ctrl/agg_scale_ctrl.cpp
+    src/ctrl/agg_polygon_ctrl.cpp
+    src/ctrl/agg_bezier_ctrl.cpp
+    gpc/gpc.c
+)
+
+set(
+  agg_LIB_HDRS
+    include/agg_alpha_mask_u8.h
+    include/agg_arc.h
+    include/agg_array.h
+    include/agg_arrowhead.h
+    include/agg_basics.h
+    include/agg_bezier_arc.h
+    include/agg_bitset_iterator.h
+    include/agg_blur.h
+    include/agg_bounding_rect.h
+    include/agg_bspline.h
+    include/agg_clip_liang_barsky.h
+    include/agg_color_gray.h
+    include/agg_color_rgba.h
+    include/agg_config.h
+    include/agg_conv_adaptor_vcgen.h
+    include/agg_conv_adaptor_vpgen.h
+    include/agg_c...
 
[truncated message content] |