From: <ai...@us...> - 2013-12-02 00:16:55
|
Revision: 12794 http://sourceforge.net/p/plplot/code/12794 Author: airwin Date: 2013-12-02 00:16:47 +0000 (Mon, 02 Dec 2013) Log Message: ----------- In preparation for the "add_subdirectory" reorganization of epa_build rename all existing */bp.cmake files as */CMakeLists.txt files. N.B. this commit breaks the epa_build project which should not be expected to work again until the final commit in this series of changes which should implement using add_subdirectory to access the CMake logic in these (newly renamed) */CMakeLists.txt files without the variable scope issues that occurred for the previous "include */bp.cmake" approach. Added Paths: ----------- trunk/cmake/epa_build/cairo/CMakeLists.txt trunk/cmake/epa_build/cmake/CMakeLists.txt trunk/cmake/epa_build/docbook-xml/CMakeLists.txt trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt trunk/cmake/epa_build/fontconfig/CMakeLists.txt trunk/cmake/epa_build/glib/CMakeLists.txt trunk/cmake/epa_build/gobject-introspection/CMakeLists.txt trunk/cmake/epa_build/gperf/CMakeLists.txt trunk/cmake/epa_build/gtk-doc/CMakeLists.txt trunk/cmake/epa_build/harfbuzz/CMakeLists.txt trunk/cmake/epa_build/intltool/CMakeLists.txt trunk/cmake/epa_build/itcl3/CMakeLists.txt trunk/cmake/epa_build/itk/CMakeLists.txt trunk/cmake/epa_build/itk3/CMakeLists.txt trunk/cmake/epa_build/itstool/CMakeLists.txt trunk/cmake/epa_build/iwidgets/CMakeLists.txt trunk/cmake/epa_build/libagg/CMakeLists.txt trunk/cmake/epa_build/libffi/CMakeLists.txt trunk/cmake/epa_build/libharu/CMakeLists.txt trunk/cmake/epa_build/libpcre/CMakeLists.txt trunk/cmake/epa_build/libqhull/CMakeLists.txt trunk/cmake/epa_build/libxml2/CMakeLists.txt trunk/cmake/epa_build/libxslt/CMakeLists.txt trunk/cmake/epa_build/ndiff/CMakeLists.txt trunk/cmake/epa_build/pango/CMakeLists.txt trunk/cmake/epa_build/pixman/CMakeLists.txt trunk/cmake/epa_build/pkg-config/CMakeLists.txt trunk/cmake/epa_build/plplot/CMakeLists.txt trunk/cmake/epa_build/ragel/CMakeLists.txt trunk/cmake/epa_build/shapelib/CMakeLists.txt trunk/cmake/epa_build/subversion/CMakeLists.txt trunk/cmake/epa_build/swig/CMakeLists.txt trunk/cmake/epa_build/tcl/CMakeLists.txt trunk/cmake/epa_build/tk/CMakeLists.txt trunk/cmake/epa_build/wxwidgets/CMakeLists.txt trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt trunk/cmake/epa_build/yelp-tools/CMakeLists.txt trunk/cmake/epa_build/yelp-xsl/CMakeLists.txt Removed Paths: ------------- trunk/cmake/epa_build/cairo/bp.cmake trunk/cmake/epa_build/cmake/bp.cmake trunk/cmake/epa_build/docbook-xml/bp.cmake trunk/cmake/epa_build/docbook-xsl/bp.cmake trunk/cmake/epa_build/fontconfig/bp.cmake trunk/cmake/epa_build/glib/bp.cmake trunk/cmake/epa_build/gobject-introspection/bp.cmake trunk/cmake/epa_build/gperf/bp.cmake trunk/cmake/epa_build/gtk-doc/bp.cmake trunk/cmake/epa_build/harfbuzz/bp.cmake trunk/cmake/epa_build/intltool/bp.cmake trunk/cmake/epa_build/itcl3/bp.cmake trunk/cmake/epa_build/itk/bp.cmake trunk/cmake/epa_build/itk3/bp.cmake trunk/cmake/epa_build/itstool/bp.cmake trunk/cmake/epa_build/iwidgets/bp.cmake trunk/cmake/epa_build/libagg/bp.cmake trunk/cmake/epa_build/libffi/bp.cmake trunk/cmake/epa_build/libharu/bp.cmake trunk/cmake/epa_build/libpcre/bp.cmake trunk/cmake/epa_build/libqhull/bp.cmake trunk/cmake/epa_build/libxml2/bp.cmake trunk/cmake/epa_build/libxslt/bp.cmake trunk/cmake/epa_build/ndiff/bp.cmake trunk/cmake/epa_build/pango/bp.cmake trunk/cmake/epa_build/pixman/bp.cmake trunk/cmake/epa_build/pkg-config/bp.cmake trunk/cmake/epa_build/plplot/bp.cmake trunk/cmake/epa_build/ragel/bp.cmake trunk/cmake/epa_build/shapelib/bp.cmake trunk/cmake/epa_build/subversion/bp.cmake trunk/cmake/epa_build/swig/bp.cmake trunk/cmake/epa_build/tcl/bp.cmake trunk/cmake/epa_build/tk/bp.cmake trunk/cmake/epa_build/wxwidgets/bp.cmake trunk/cmake/epa_build/xmlcatalog-wrapper/bp.cmake trunk/cmake/epa_build/yelp-tools/bp.cmake trunk/cmake/epa_build/yelp-xsl/bp.cmake Copied: trunk/cmake/epa_build/cairo/CMakeLists.txt (from rev 12790, trunk/cmake/epa_build/cairo/bp.cmake) =================================================================== --- trunk/cmake/epa_build/cairo/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/cairo/CMakeLists.txt 2013-12-02 00:16:47 UTC (rev 12794) @@ -0,0 +1,104 @@ +# cairo/bp.cmake +# N.B. this file is generated so if you edit it you will lose all your +# changes the next time it is generated (typically by running +# either/both the update_added_packages.sh or update_pango_packages.sh +# scripts). If those scripts do not provide good results, then +# consider changing their source files (e.g., by editing the files +# used in those scripts) or add a patch to be run by those scripts). + +# This file should be included directly or indirectly from a top-level +# CMakeLists.txt file to configure the build of cairo. + +# 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 Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# 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 +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser 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 top-level CMakeLists.txt file that includes this file should +# have run "include(ExternalProject)" and set EP_BASE variable (and +# corresponding directory property) as well as various BP variables +# used below that configure how the External_Project functions +# operate. + +# Protect against configuring a build twice in one CMake call +if(cairo_configured) + return() +endif(cairo_configured) +set(cairo_configured ON) + +# List of dependencies (most of which are build tools) which should be +# ignored. +set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) + +set(cairo_dependencies_LIST fontconfig;gtk-doc;pixman;pkg-config) +# Remove dependencies that should be ignored. +if(cairo_dependencies_LIST) + list(REMOVE_ITEM cairo_dependencies_LIST ${BP_ignored_dependencies_LIST}) +endif(cairo_dependencies_LIST) + +set(cairo_dependencies_targets) +foreach(build_configuration ${cairo_dependencies_LIST}) + if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) + include(${build_configuration}/bp.cmake) + list(APPEND cairo_dependencies_targets build_${build_configuration}) + else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) + message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of cairo has been installed another way.") + endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) +endforeach(build_configuration ${cairo_dependences_LIST}) + +# This can be safely done only after above includes. +set(BP_PACKAGE cairo) + +# Data that is related to downloads. +set(${BP_PACKAGE}_URL http://cairographics.org/releases/cairo-1.12.14.tar.xz) +set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256) +set(${BP_PACKAGE}_DOWNLOAD_HASH 96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13) + +# Data that is related to the PATH that must be used. +if(MSYS_PLATFORM) + #set(BP_PATH_NODLL "${BP_PATH}") + #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}") + determine_msys_path(BP_PATH "${BP_PATH}") + # Must have all elements of env command in MSYS platform form + determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") + set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") +else(MSYS_PLATFORM) + set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") + set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") +endif(MSYS_PLATFORM) +#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}") + +set(${BP_PACKAGE}_SET_CXXFLAGS "CXXFLAGS=$ENV{CXXFLAGS}") + +# Drop -fvisibility=hidden since that option does not work for a +# number of software packages that are configured automatically using +# this template. +string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CFLAGS "${${BP_PACKAGE}_SET_CFLAGS}") +string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CXXFLAGS "${${BP_PACKAGE}_SET_CXXFLAGS}") + +ExternalProject_Add( + build_${BP_PACKAGE} + DEPENDS ${${BP_PACKAGE}_dependencies_targets} + URL ${${BP_PACKAGE}_URL} + URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --enable-xlib + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} + BUILD_IN_SOURCE OFF + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install + ) + +list(APPEND build_target_LIST build_${BP_PACKAGE}) +# Restore BP_PATH to original state. +set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}") +#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}") Deleted: trunk/cmake/epa_build/cairo/bp.cmake =================================================================== --- trunk/cmake/epa_build/cairo/bp.cmake 2013-12-01 22:58:49 UTC (rev 12793) +++ trunk/cmake/epa_build/cairo/bp.cmake 2013-12-02 00:16:47 UTC (rev 12794) @@ -1,104 +0,0 @@ -# cairo/bp.cmake -# N.B. this file is generated so if you edit it you will lose all your -# changes the next time it is generated (typically by running -# either/both the update_added_packages.sh or update_pango_packages.sh -# scripts). If those scripts do not provide good results, then -# consider changing their source files (e.g., by editing the files -# used in those scripts) or add a patch to be run by those scripts). - -# This file should be included directly or indirectly from a top-level -# CMakeLists.txt file to configure the build of cairo. - -# 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 Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. - -# 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 -# Lesser General Public License for more details. - -# You should have received a copy of the GNU Lesser 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 top-level CMakeLists.txt file that includes this file should -# have run "include(ExternalProject)" and set EP_BASE variable (and -# corresponding directory property) as well as various BP variables -# used below that configure how the External_Project functions -# operate. - -# Protect against configuring a build twice in one CMake call -if(cairo_configured) - return() -endif(cairo_configured) -set(cairo_configured ON) - -# List of dependencies (most of which are build tools) which should be -# ignored. -set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) - -set(cairo_dependencies_LIST fontconfig;gtk-doc;pixman;pkg-config) -# Remove dependencies that should be ignored. -if(cairo_dependencies_LIST) - list(REMOVE_ITEM cairo_dependencies_LIST ${BP_ignored_dependencies_LIST}) -endif(cairo_dependencies_LIST) - -set(cairo_dependencies_targets) -foreach(build_configuration ${cairo_dependencies_LIST}) - if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) - include(${build_configuration}/bp.cmake) - list(APPEND cairo_dependencies_targets build_${build_configuration}) - else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) - message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of cairo has been installed another way.") - endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) -endforeach(build_configuration ${cairo_dependences_LIST}) - -# This can be safely done only after above includes. -set(BP_PACKAGE cairo) - -# Data that is related to downloads. -set(${BP_PACKAGE}_URL http://cairographics.org/releases/cairo-1.12.14.tar.xz) -set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256) -set(${BP_PACKAGE}_DOWNLOAD_HASH 96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13) - -# Data that is related to the PATH that must be used. -if(MSYS_PLATFORM) - #set(BP_PATH_NODLL "${BP_PATH}") - #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}") - determine_msys_path(BP_PATH "${BP_PATH}") - # Must have all elements of env command in MSYS platform form - determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") - set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") -else(MSYS_PLATFORM) - set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") - set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") -endif(MSYS_PLATFORM) -#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}") - -set(${BP_PACKAGE}_SET_CXXFLAGS "CXXFLAGS=$ENV{CXXFLAGS}") - -# Drop -fvisibility=hidden since that option does not work for a -# number of software packages that are configured automatically using -# this template. -string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CFLAGS "${${BP_PACKAGE}_SET_CFLAGS}") -string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CXXFLAGS "${${BP_PACKAGE}_SET_CXXFLAGS}") - -ExternalProject_Add( - build_${BP_PACKAGE} - DEPENDS ${${BP_PACKAGE}_dependencies_targets} - URL ${${BP_PACKAGE}_URL} - URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH} - CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --enable-xlib - BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} - BUILD_IN_SOURCE OFF - INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install - ) - -list(APPEND build_target_LIST build_${BP_PACKAGE}) -# Restore BP_PATH to original state. -set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}") -#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}") Copied: trunk/cmake/epa_build/cmake/CMakeLists.txt (from rev 12783, trunk/cmake/epa_build/cmake/bp.cmake) =================================================================== --- trunk/cmake/epa_build/cmake/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/cmake/CMakeLists.txt 2013-12-02 00:16:47 UTC (rev 12794) @@ -0,0 +1,64 @@ +# cmake/bp.cmake +# This file should be included directly or indirectly from a top-level +# CMakeLists.txt file to configure the build of cmake. + +# 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 Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# 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 +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser 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 top-level CMakeLists.txt file that includes this file should +# have run "include(ExternalProject)" and set EP_BASE variable (and +# corresponding directory property) as well as various BP variables +# used below that configure how the External_Project functions +# operate. + +set(BP_PACKAGE cmake) + +# Protect against configuring a build twice in one CMake call +if(${BP_PACKAGE}_configured) + return() +endif(${BP_PACKAGE}_configured) +set(${BP_PACKAGE}_configured ON) + +# Data that is related to downloads. +set(BP_CMAKE_DIR v2.8) +set(BP_CMAKE_VERSION 2.8.11.1) +set(${BP_PACKAGE}_URL http://www.cmake.org/files/${BP_CMAKE_DIR}/cmake-${BP_CMAKE_VERSION}.tar.gz) +set(${BP_PACKAGE}_URL_MD5 df5324a3b203373a9e0a04b924281a43) + +# Data that is related to the PATH that must be used. +if(MSYS_PLATFORM) + set(BP_PATH_NODLL "${BP_PATH}") + set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}") + determine_msys_path(BP_PATH "${BP_PATH}") + determine_msys_path(${BP_PACKAGE}_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") +else(MSYS_PLATFORM) + set(${BP_PACKAGE}_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") +endif(MSYS_PLATFORM) +#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}") + +ExternalProject_Add( + build_${BP_PACKAGE} + URL ${${BP_PACKAGE}_URL} + URL_MD5 ${${BP_PACKAGE}_URL_MD5} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} CFLAGS=-O3 CXXFLAGS=-O3 ${SH_EXECUTABLE} ${EP_BASE}/Source/build_${BP_PACKAGE}/bootstrap --prefix=${${BP_PACKAGE}_INSTALL_PREFIX} --parallel=8 + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install + ) + +list(APPEND build_target_LIST build_${BP_PACKAGE}) +# Restore BP_PATH to original state. +set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}") +#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}") Deleted: trunk/cmake/epa_build/cmake/bp.cmake =================================================================== --- trunk/cmake/epa_build/cmake/bp.cmake 2013-12-01 22:58:49 UTC (rev 12793) +++ trunk/cmake/epa_build/cmake/bp.cmake 2013-12-02 00:16:47 UTC (rev 12794) @@ -1,64 +0,0 @@ -# cmake/bp.cmake -# This file should be included directly or indirectly from a top-level -# CMakeLists.txt file to configure the build of cmake. - -# 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 Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. - -# 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 -# Lesser General Public License for more details. - -# You should have received a copy of the GNU Lesser 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 top-level CMakeLists.txt file that includes this file should -# have run "include(ExternalProject)" and set EP_BASE variable (and -# corresponding directory property) as well as various BP variables -# used below that configure how the External_Project functions -# operate. - -set(BP_PACKAGE cmake) - -# Protect against configuring a build twice in one CMake call -if(${BP_PACKAGE}_configured) - return() -endif(${BP_PACKAGE}_configured) -set(${BP_PACKAGE}_configured ON) - -# Data that is related to downloads. -set(BP_CMAKE_DIR v2.8) -set(BP_CMAKE_VERSION 2.8.11.1) -set(${BP_PACKAGE}_URL http://www.cmake.org/files/${BP_CMAKE_DIR}/cmake-${BP_CMAKE_VERSION}.tar.gz) -set(${BP_PACKAGE}_URL_MD5 df5324a3b203373a9e0a04b924281a43) - -# Data that is related to the PATH that must be used. -if(MSYS_PLATFORM) - set(BP_PATH_NODLL "${BP_PATH}") - set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}") - determine_msys_path(BP_PATH "${BP_PATH}") - determine_msys_path(${BP_PACKAGE}_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") -else(MSYS_PLATFORM) - set(${BP_PACKAGE}_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") -endif(MSYS_PLATFORM) -#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}") - -ExternalProject_Add( - build_${BP_PACKAGE} - URL ${${BP_PACKAGE}_URL} - URL_MD5 ${${BP_PACKAGE}_URL_MD5} - CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} CFLAGS=-O3 CXXFLAGS=-O3 ${SH_EXECUTABLE} ${EP_BASE}/Source/build_${BP_PACKAGE}/bootstrap --prefix=${${BP_PACKAGE}_INSTALL_PREFIX} --parallel=8 - BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} - INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install - ) - -list(APPEND build_target_LIST build_${BP_PACKAGE}) -# Restore BP_PATH to original state. -set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}") -#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}") Copied: trunk/cmake/epa_build/docbook-xml/CMakeLists.txt (from rev 12793, trunk/cmake/epa_build/docbook-xml/bp.cmake) =================================================================== --- trunk/cmake/epa_build/docbook-xml/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/docbook-xml/CMakeLists.txt 2013-12-02 00:16:47 UTC (rev 12794) @@ -0,0 +1,102 @@ +# docbook-xml/bp.cmake +# This file should be included directly or indirectly from a top-level +# CMakeLists.txt file to configure the build of docbook-xml. + +# 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 Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# 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 +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser 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 top-level CMakeLists.txt file that includes this file should +# have run "include(ExternalProject)" and set EP_BASE variable (and +# corresponding directory property) as well as various BP variables +# used below that configure how the External_Project functions +# operate. + +# Protect against configuring a build twice in one CMake call +if(docbook-xml_configured) + return() +endif(docbook-xml_configured) +set(docbook-xml_configured ON) + +# List of dependencies (most of which are build tools) which should be +# ignored. +set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) + +set(docbook-xml_dependencies_LIST libxml2) +# Remove dependencies that should be ignored. +if(docbook-xml_dependencies_LIST) + list(REMOVE_ITEM docbook-xml_dependencies_LIST ${BP_ignored_dependencies_LIST}) +endif(docbook-xml_dependencies_LIST) + +set(docbook-xml_dependencies_targets) +foreach(build_configuration ${docbook-xml_dependencies_LIST}) + if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) + include(${build_configuration}/bp.cmake) + list(APPEND docbook-xml_dependencies_targets build_${build_configuration}) + else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) + message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of docbook-xml has been installed another way.") + endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) +endforeach(build_configuration ${docbook-xml_dependences_LIST}) + +# This can be safely done only after above includes. +set(BP_PACKAGE docbook-xml) + +# Data that is related to downloads. +set(${BP_PACKAGE}_URL http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip) +set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5) +set(${BP_PACKAGE}_DOWNLOAD_HASH 03083e288e87a7e829e437358da7ef9e) + +# Data that is related to the PATH that must be used. +if(MSYS_PLATFORM) + #set(BP_PATH_NODLL "${BP_PATH}") + #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}") + determine_msys_path(BP_PATH "${BP_PATH}") + # Must have all elements of env command in MSYS platform form + determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") + set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") +else(MSYS_PLATFORM) + set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") + set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") +endif(MSYS_PLATFORM) +#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}") + +ExternalProject_Add( + build_${BP_PACKAGE} + DEPENDS ${${BP_PACKAGE}_dependencies_targets} + URL ${${BP_PACKAGE}_URL} + URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} ${EP_BASE}/Source/build_${BP_PACKAGE} + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} + BUILD_IN_SOURCE OFF + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install + ) + +# Add custom commands to the current no-command update step. +add_custom_command( + OUTPUT + ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-update + COMMAND ${CMAKE_COMMAND} -E copy + ${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}/${BP_PACKAGE}_CMakeLists.txt + APPEND + ) + +list(APPEND build_target_LIST build_${BP_PACKAGE}) +# Restore BP_PATH to original state. +set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}") +#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}") Deleted: trunk/cmake/epa_build/docbook-xml/bp.cmake =================================================================== --- trunk/cmake/epa_build/docbook-xml/bp.cmake 2013-12-01 22:58:49 UTC (rev 12793) +++ trunk/cmake/epa_build/docbook-xml/bp.cmake 2013-12-02 00:16:47 UTC (rev 12794) @@ -1,102 +0,0 @@ -# docbook-xml/bp.cmake -# This file should be included directly or indirectly from a top-level -# CMakeLists.txt file to configure the build of docbook-xml. - -# 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 Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. - -# 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 -# Lesser General Public License for more details. - -# You should have received a copy of the GNU Lesser 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 top-level CMakeLists.txt file that includes this file should -# have run "include(ExternalProject)" and set EP_BASE variable (and -# corresponding directory property) as well as various BP variables -# used below that configure how the External_Project functions -# operate. - -# Protect against configuring a build twice in one CMake call -if(docbook-xml_configured) - return() -endif(docbook-xml_configured) -set(docbook-xml_configured ON) - -# List of dependencies (most of which are build tools) which should be -# ignored. -set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) - -set(docbook-xml_dependencies_LIST libxml2) -# Remove dependencies that should be ignored. -if(docbook-xml_dependencies_LIST) - list(REMOVE_ITEM docbook-xml_dependencies_LIST ${BP_ignored_dependencies_LIST}) -endif(docbook-xml_dependencies_LIST) - -set(docbook-xml_dependencies_targets) -foreach(build_configuration ${docbook-xml_dependencies_LIST}) - if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) - include(${build_configuration}/bp.cmake) - list(APPEND docbook-xml_dependencies_targets build_${build_configuration}) - else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) - message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of docbook-xml has been installed another way.") - endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) -endforeach(build_configuration ${docbook-xml_dependences_LIST}) - -# This can be safely done only after above includes. -set(BP_PACKAGE docbook-xml) - -# Data that is related to downloads. -set(${BP_PACKAGE}_URL http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip) -set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5) -set(${BP_PACKAGE}_DOWNLOAD_HASH 03083e288e87a7e829e437358da7ef9e) - -# Data that is related to the PATH that must be used. -if(MSYS_PLATFORM) - #set(BP_PATH_NODLL "${BP_PATH}") - #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}") - determine_msys_path(BP_PATH "${BP_PATH}") - # Must have all elements of env command in MSYS platform form - determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") - set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") -else(MSYS_PLATFORM) - set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") - set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") -endif(MSYS_PLATFORM) -#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}") - -ExternalProject_Add( - build_${BP_PACKAGE} - DEPENDS ${${BP_PACKAGE}_dependencies_targets} - URL ${${BP_PACKAGE}_URL} - URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH} - CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} ${EP_BASE}/Source/build_${BP_PACKAGE} - BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} - BUILD_IN_SOURCE OFF - INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install - ) - -# Add custom commands to the current no-command update step. -add_custom_command( - OUTPUT - ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-update - COMMAND ${CMAKE_COMMAND} -E copy - ${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}/${BP_PACKAGE}_CMakeLists.txt - APPEND - ) - -list(APPEND build_target_LIST build_${BP_PACKAGE}) -# Restore BP_PATH to original state. -set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}") -#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}") Copied: trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt (from rev 12793, trunk/cmake/epa_build/docbook-xsl/bp.cmake) =================================================================== --- trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt 2013-12-02 00:16:47 UTC (rev 12794) @@ -0,0 +1,102 @@ +# docbook-xsl/bp.cmake +# This file should be included directly or indirectly from a top-level +# CMakeLists.txt file to configure the build of docbook-xsl. + +# 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 Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# 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 +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser 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 top-level CMakeLists.txt file that includes this file should +# have run "include(ExternalProject)" and set EP_BASE variable (and +# corresponding directory property) as well as various BP variables +# used below that configure how the External_Project functions +# operate. + +# Protect against configuring a build twice in one CMake call +if(docbook-xsl_configured) + return() +endif(docbook-xsl_configured) +set(docbook-xsl_configured ON) + +# List of dependencies (most of which are build tools) which should be +# ignored. +set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) + +set(docbook-xsl_dependencies_LIST libxml2) +# Remove dependencies that should be ignored. +if(docbook-xsl_dependencies_LIST) + list(REMOVE_ITEM docbook-xsl_dependencies_LIST ${BP_ignored_dependencies_LIST}) +endif(docbook-xsl_dependencies_LIST) + +set(docbook-xsl_dependencies_targets) +foreach(build_configuration ${docbook-xsl_dependencies_LIST}) + if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) + include(${build_configuration}/bp.cmake) + list(APPEND docbook-xsl_dependencies_targets build_${build_configuration}) + else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) + message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of docbook-xsl has been installed another way.") + endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) +endforeach(build_configuration ${docbook-xsl_dependences_LIST}) + +# This can be safely done only after above includes. +set(BP_PACKAGE docbook-xsl) + +# Data that is related to downloads. +set(${BP_PACKAGE}_URL http://downloads.sourceforge.net/docbook/docbook-xsl-1.78.1.tar.bz2) +set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5) +set(${BP_PACKAGE}_DOWNLOAD_HASH 6dd0f89131cc35bf4f2ed105a1c17771) + +# Data that is related to the PATH that must be used. +if(MSYS_PLATFORM) + #set(BP_PATH_NODLL "${BP_PATH}") + #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}") + determine_msys_path(BP_PATH "${BP_PATH}") + # Must have all elements of env command in MSYS platform form + determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") + set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") +else(MSYS_PLATFORM) + set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") + set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") +endif(MSYS_PLATFORM) +#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}") + +ExternalProject_Add( + build_${BP_PACKAGE} + DEPENDS ${${BP_PACKAGE}_dependencies_targets} + URL ${${BP_PACKAGE}_URL} + URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} ${EP_BASE}/Source/build_${BP_PACKAGE} + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} + BUILD_IN_SOURCE OFF + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install + ) + +# Add custom commands to the current no-command update step. +add_custom_command( + OUTPUT + ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-update + COMMAND ${CMAKE_COMMAND} -E copy + ${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}/${BP_PACKAGE}_CMakeLists.txt + APPEND + ) + +list(APPEND build_target_LIST build_${BP_PACKAGE}) +# Restore BP_PATH to original state. +set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}") +#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}") Deleted: trunk/cmake/epa_build/docbook-xsl/bp.cmake =================================================================== --- trunk/cmake/epa_build/docbook-xsl/bp.cmake 2013-12-01 22:58:49 UTC (rev 12793) +++ trunk/cmake/epa_build/docbook-xsl/bp.cmake 2013-12-02 00:16:47 UTC (rev 12794) @@ -1,102 +0,0 @@ -# docbook-xsl/bp.cmake -# This file should be included directly or indirectly from a top-level -# CMakeLists.txt file to configure the build of docbook-xsl. - -# 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 Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. - -# 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 -# Lesser General Public License for more details. - -# You should have received a copy of the GNU Lesser 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 top-level CMakeLists.txt file that includes this file should -# have run "include(ExternalProject)" and set EP_BASE variable (and -# corresponding directory property) as well as various BP variables -# used below that configure how the External_Project functions -# operate. - -# Protect against configuring a build twice in one CMake call -if(docbook-xsl_configured) - return() -endif(docbook-xsl_configured) -set(docbook-xsl_configured ON) - -# List of dependencies (most of which are build tools) which should be -# ignored. -set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) - -set(docbook-xsl_dependencies_LIST libxml2) -# Remove dependencies that should be ignored. -if(docbook-xsl_dependencies_LIST) - list(REMOVE_ITEM docbook-xsl_dependencies_LIST ${BP_ignored_dependencies_LIST}) -endif(docbook-xsl_dependencies_LIST) - -set(docbook-xsl_dependencies_targets) -foreach(build_configuration ${docbook-xsl_dependencies_LIST}) - if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) - include(${build_configuration}/bp.cmake) - list(APPEND docbook-xsl_dependencies_targets build_${build_configuration}) - else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) - message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of docbook-xsl has been installed another way.") - endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) -endforeach(build_configuration ${docbook-xsl_dependences_LIST}) - -# This can be safely done only after above includes. -set(BP_PACKAGE docbook-xsl) - -# Data that is related to downloads. -set(${BP_PACKAGE}_URL http://downloads.sourceforge.net/docbook/docbook-xsl-1.78.1.tar.bz2) -set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5) -set(${BP_PACKAGE}_DOWNLOAD_HASH 6dd0f89131cc35bf4f2ed105a1c17771) - -# Data that is related to the PATH that must be used. -if(MSYS_PLATFORM) - #set(BP_PATH_NODLL "${BP_PATH}") - #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}") - determine_msys_path(BP_PATH "${BP_PATH}") - # Must have all elements of env command in MSYS platform form - determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") - set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") -else(MSYS_PLATFORM) - set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") - set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") -endif(MSYS_PLATFORM) -#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}") - -ExternalProject_Add( - build_${BP_PACKAGE} - DEPENDS ${${BP_PACKAGE}_dependencies_targets} - URL ${${BP_PACKAGE}_URL} - URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH} - CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} ${EP_BASE}/Source/build_${BP_PACKAGE} - BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} - BUILD_IN_SOURCE OFF - INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install - ) - -# Add custom commands to the current no-command update step. -add_custom_command( - OUTPUT - ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-update - COMMAND ${CMAKE_COMMAND} -E copy - ${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}/${BP_PACKAGE}_CMakeLists.txt - APPEND - ) - -list(APPEND build_target_LIST build_${BP_PACKAGE}) -# Restore BP_PATH to original state. -set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}") -#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}") Copied: trunk/cmake/epa_build/fontconfig/CMakeLists.txt (from rev 12790, trunk/cmake/epa_build/fontconfig/bp.cmake) =================================================================== --- trunk/cmake/epa_build/fontconfig/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/fontconfig/CMakeLists.txt 2013-12-02 00:16:47 UTC (rev 12794) @@ -0,0 +1,104 @@ +# fontconfig/bp.cmake +# N.B. this file is generated so if you edit it you will lose all your +# changes the next time it is generated (typically by running +# either/both the update_added_packages.sh or update_pango_packages.sh +# scripts). If those scripts do not provide good results, then +# consider changing their source files (e.g., by editing the files +# used in those scripts) or add a patch to be run by those scripts). + +# This file should be included directly or indirectly from a top-level +# CMakeLists.txt file to configure the build of fontconfig. + +# 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 Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# 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 +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser 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 top-level CMakeLists.txt file that includes this file should +# have run "include(ExternalProject)" and set EP_BASE variable (and +# corresponding directory property) as well as various BP variables +# used below that configure how the External_Project functions +# operate. + +# Protect against configuring a build twice in one CMake call +if(fontconfig_configured) + return() +endif(fontconfig_configured) +set(fontconfig_configured ON) + +# List of dependencies (most of which are build tools) which should be +# ignored. +set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) + +set(fontconfig_dependencies_LIST gperf) +# Remove dependencies that should be ignored. +if(fontconfig_dependencies_LIST) + list(REMOVE_ITEM fontconfig_dependencies_LIST ${BP_ignored_dependencies_LIST}) +endif(fontconfig_dependencies_LIST) + +set(fontconfig_dependencies_targets) +foreach(build_configuration ${fontconfig_dependencies_LIST}) + if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) + include(${build_configuration}/bp.cmake) + list(APPEND fontconfig_dependencies_targets build_${build_configuration}) + else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) + message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of fontconfig has been installed another way.") + endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) +endforeach(build_configuration ${fontconfig_dependences_LIST}) + +# This can be safely done only after above includes. +set(BP_PACKAGE fontconfig) + +# Data that is related to downloads. +set(${BP_PACKAGE}_URL http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.10.93.tar.bz2) +set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256) +set(${BP_PACKAGE}_DOWNLOAD_HASH ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c) + +# Data that is related to the PATH that must be used. +if(MSYS_PLATFORM) + #set(BP_PATH_NODLL "${BP_PATH}") + #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}") + determine_msys_path(BP_PATH "${BP_PATH}") + # Must have all elements of env command in MSYS platform form + determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") + set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") +else(MSYS_PLATFORM) + set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") + set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") +endif(MSYS_PLATFORM) +#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}") + +set(${BP_PACKAGE}_SET_CXXFLAGS "CXXFLAGS=$ENV{CXXFLAGS}") + +# Drop -fvisibility=hidden since that option does not work for a +# number of software packages that are configured automatically using +# this template. +string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CFLAGS "${${BP_PACKAGE}_SET_CFLAGS}") +string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CXXFLAGS "${${BP_PACKAGE}_SET_CXXFLAGS}") + +ExternalProject_Add( + build_${BP_PACKAGE} + DEPENDS ${${BP_PACKAGE}_dependencies_targets} + URL ${${BP_PACKAGE}_URL} + URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --disable-docs + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} + BUILD_IN_SOURCE OFF + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install + ) + +list(APPEND build_target_LIST build_${BP_PACKAGE}) +# Restore BP_PATH to original state. +set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}") +#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}") Deleted: trunk/cmake/epa_build/fontconfig/bp.cmake =================================================================== --- trunk/cmake/epa_build/fontconfig/bp.cmake 2013-12-01 22:58:49 UTC (rev 12793) +++ trunk/cmake/epa_build/fontconfig/bp.cmake 2013-12-02 00:16:47 UTC (rev 12794) @@ -1,104 +0,0 @@ -# fontconfig/bp.cmake -# N.B. this file is generated so if you edit it you will lose all your -# changes the next time it is generated (typically by running -# either/both the update_added_packages.sh or update_pango_packages.sh -# scripts). If those scripts do not provide good results, then -# consider changing their source files (e.g., by editing the files -# used in those scripts) or add a patch to be run by those scripts). - -# This file should be included directly or indirectly from a top-level -# CMakeLists.txt file to configure the build of fontconfig. - -# 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 Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. - -# 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 -# Lesser General Public License for more details. - -# You should have received a copy of the GNU Lesser 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 top-level CMakeLists.txt file that includes this file should -# have run "include(ExternalProject)" and set EP_BASE variable (and -# corresponding directory property) as well as various BP variables -# used below that configure how the External_Project functions -# operate. - -# Protect against configuring a build twice in one CMake call -if(fontconfig_configured) - return() -endif(fontconfig_configured) -set(fontconfig_configured ON) - -# List of dependencies (most of which are build tools) which should be -# ignored. -set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) - -set(fontconfig_dependencies_LIST gperf) -# Remove dependencies that should be ignored. -if(fontconfig_dependencies_LIST) - list(REMOVE_ITEM fontconfig_dependencies_LIST ${BP_ignored_dependencies_LIST}) -endif(fontconfig_dependencies_LIST) - -set(fontconfig_dependencies_targets) -foreach(build_configuration ${fontconfig_dependencies_LIST}) - if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) - include(${build_configuration}/bp.cmake) - list(APPEND fontconfig_dependencies_targets build_${build_configuration}) - else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) - message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of fontconfig has been installed another way.") - endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) -endforeach(build_configuration ${fontconfig_dependences_LIST}) - -# This can be safely done only after above includes. -set(BP_PACKAGE fontconfig) - -# Data that is related to downloads. -set(${BP_PACKAGE}_URL http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.10.93.tar.bz2) -set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256) -set(${BP_PACKAGE}_DOWNLOAD_HASH ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c) - -# Data that is related to the PATH that must be used. -if(MSYS_PLATFORM) - #set(BP_PATH_NODLL "${BP_PATH}") - #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}") - determine_msys_path(BP_PATH "${BP_PATH}") - # Must have all elements of env command in MSYS platform form - determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") - set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") -else(MSYS_PLATFORM) - set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") - set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") -endif(MSYS_PLATFORM) -#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}") - -set(${BP_PACKAGE}_SET_CXXFLAGS "CXXFLAGS=$ENV{CXXFLAGS}") - -# Drop -fvisibility=hidden since that option does not work for a -# number of software packages that are configured automatically using -# this template. -string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CFLAGS "${${BP_PACKAGE}_SET_CFLAGS}") -string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CXXFLAGS "${${BP_PACKAGE}_SET_CXXFLAGS}") - -ExternalProject_Add( - build_${BP_PACKAGE} - DEPENDS ${${BP_PACKAGE}_dependencies_targets} - URL ${${BP_PACKAGE}_URL} - URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH} - CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --disable-docs - BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} - BUILD_IN_SOURCE OFF - INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install - ) - -list(APPEND build_target_LIST build_${BP_PACKAGE}) -# Restore BP_PATH to original state. -set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}") -#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}") Copied: trunk/cmake/epa_build/glib/CMakeLists.txt (from rev 12790, trunk/cmake/epa_build/glib/bp.cmake) =================================================================== --- trunk/cmake/epa_build/glib/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/glib/CMakeLists.txt 2013-12-02 00:16:47 UTC (rev 12794) @@ -0,0 +1,104 @@ +# glib/bp.cmake +# N.B. this file is generated so if you edit it you will lose all your +# changes the next time it is generated (typically by running +# either/both the update_added_packages.sh or update_pango_packages.sh +# scripts). If those scripts do not provide good results, then +# consider changing their source files (e.g., by editing the files +# used in those scripts) or add a patch to be run by those scripts). + +# This file should be included directly or indirectly from a top-level +# CMakeLists.txt file to configure the build of glib. + +# 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 Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# 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 +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser 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 top-level CMakeLists.txt file that includes this file should +# have run "include(ExternalProject)" and set EP_BASE variable (and +# corresponding directory property) as well as various BP variables +# used below that configure how the External_Project functions +# operate. + +# Protect against configuring a build twice in one CMake call +if(glib_configured) + return() +endif(glib_configured) +set(glib_configured ON) + +# List of dependencies (most of which are build tools) which should be +# ignored. +set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) + +set(glib_dependencies_LIST gtk-doc;libffi) +# Remove dependencies that should be ignored. +if(glib_dependencies_LIST) + list(REMOVE_ITEM glib_dependencies_LIST ${BP_ignored_dependencies_LIST}) +endif(glib_dependencies_LIST) + +set(glib_dependencies_targets) +foreach(build_configuration ${glib_dependencies_LIST}) + if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) + include(${build_configuration}/bp.cmake) + list(APPEND glib_dependencies_targets build_${build_configuration}) + else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) + message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of glib has been installed another way.") + endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) +endforeach(build_configuration ${glib_dependences_LIST}) + +# This can be safely done only after above includes. +set(BP_PACKAGE glib) + +# Data that is related to downloads. +set(${BP_PACKAGE}_URL http://download.gnome.org/sources/glib/2.37/glib-2.37.4.tar.xz) +set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256) +set(${BP_PACKAGE}_DOWNLOAD_HASH 7e76a32e6ea0ced118aa64f87e46cdf5c3e90527f1f0eb93eabe42a03cebd1e7) + +# Data that is related to the PATH that must be used. +if(MSYS_PLATFORM) + #set(BP_PATH_NODLL "${BP_PATH}") + #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}") + determine_msys_path(BP_PATH "${BP_PATH}") + # Must have all elements of env command in MSYS platform form + determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") + set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=-march=native $ENV{CFLAGS}") +else(MSYS_PLATFORM) + set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}") + set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}") +endif(MSYS_PLATFORM) +#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}") + +set(${BP_PACKAGE}_SET_CXXFLAGS "CXXFLAGS=$ENV{CXXFLAGS}") + +# Drop -fvisibility=hidden since that option does not work for a +# number of software packages that are configured automatically using +# this template. +string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CFLAGS "${${BP_PACKAGE}_SET_CFLAGS}") +string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CXXFLAGS "${${BP_PACKAGE}_SET_CXXFLAGS}") + +ExternalProject_Add( + build_${BP_PACKAGE} + DEPENDS ${${BP_PACKAGE}_dependencies_targets} + URL ${${BP_PACKAGE}_URL} + URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --enable-installed-tests + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} + BUILD_IN_SOURCE OFF + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install + ) + +list(APPEND build_target_LIST build_${BP_PACKAGE}) +# Restore BP_PATH to original state. +set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}") +#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}") Deleted: trunk/cmake/epa_build/glib/bp.cmake =================================================================== --- trunk/cmake/epa_build/glib/bp.cmake 2013-12-01 22:58:49 UTC (rev 12793) +++ trunk/cmake/epa_build/glib/bp.cmake 2013-12-02 00:16:47 UTC (rev 12794) @@ -1,104 +0,0 @@ -# glib/bp.cmake -# N.B. this file is generated so if you edit it you will lose all your -# changes the next time it is generated (typically by running -# either/both the update_added_packages.sh or update_pango_packages.sh -# scripts). If those scripts do not provide good results, then -# consider changing their source files (e.g., by editing the files -# used in those scripts) or add a patch to be run by those scripts). - -# This file should be included directly or indirectly from a top-level -# CMakeLists.txt file to configure the build of glib. - -# 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 Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. - -# 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 -# Lesser General Public License for more details. - -# You should have received a copy of the GNU Lesser 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 top-level CMakeLists.txt file that includes this file should -# have run "include(ExternalProject)" and set EP_BASE variable (and -# corresponding directory property) as well as various BP variables -# used below that configure how the External_Project functions -# operate. - -# Protect against configuring a build twice in one CMake call -if(glib_configured) - return() -endif(glib_configured) -set(glib_configured ON) - -# List of dependencies (most of which are build tools) which should be -# ignored. -set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) - -set(glib_dependencies_LIST gtk-doc;libffi) -# Remove dependencies that should be ignored. -if(glib_dependencies_LIST) - list(REMOVE_ITEM glib_dependencies_LIST ${BP_ignored_dependencies_LIST}) -endif(glib_dependencies_LIST) - -set(glib_dependencies_targets) -foreach(build_configuration ${glib_dependencies_LIST}) - if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) - include(${build_configuration}/bp.cmake) - list(APPEND glib_dependencies_targets build_${build_configuration}) - else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) - message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of glib has been installed another way.") - endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake) -endforeach(build_con... [truncated message content] |