Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12801] trunk/cmake/epa_build
|
From: <ai...@us...> - 2013-12-02 07:26:02
|
Revision: 12801
http://sourceforge.net/p/plplot/code/12801
Author: airwin
Date: 2013-12-02 07:25:56 +0000 (Mon, 02 Dec 2013)
Log Message:
-----------
Update automatically configured builds to new add_subdirectory method
while replacing all "BP_" variables by the "EPA_" equivalents if those
are set in the top-level CMakeLists.txt file, or else dropping the
${BP_PROJECT}_ prefix altogether when warranted since the variable
scope issues are much reduced with the add_subdirectory method
we are still in the process of implementing.
Modified Paths:
--------------
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/itcl3/CMakeLists.txt
trunk/cmake/epa_build/itk/CMakeLists.txt
trunk/cmake/epa_build/itk3/CMakeLists.txt
trunk/cmake/epa_build/iwidgets/CMakeLists.txt
trunk/cmake/epa_build/libagg/CMakeLists.txt
trunk/cmake/epa_build/libharu/CMakeLists.txt
trunk/cmake/epa_build/libqhull/CMakeLists.txt
trunk/cmake/epa_build/ndiff/CMakeLists.txt
trunk/cmake/epa_build/pkg-config/CMakeLists.txt
trunk/cmake/epa_build/plplot/CMakeLists.txt
trunk/cmake/epa_build/shapelib/CMakeLists.txt
trunk/cmake/epa_build/subversion/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
Modified: trunk/cmake/epa_build/cmake/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/cmake/CMakeLists.txt 2013-12-02 07:19:58 UTC (rev 12800)
+++ trunk/cmake/epa_build/cmake/CMakeLists.txt 2013-12-02 07:25:56 UTC (rev 12801)
@@ -1,4 +1,4 @@
-# cmake/bp.cmake
+# cmake/CMakeLists.txt
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of cmake.
@@ -19,46 +19,46 @@
# 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
+# have run "include(ExternalProject)" and set EPA_BASE variable (and
+# corresponding directory property) as well as various EPA variables
# used below that configure how the External_Project functions
# operate.
-set(BP_PACKAGE cmake)
+set(PACKAGE cmake)
# Protect against configuring a build twice in one CMake call
-if(${BP_PACKAGE}_configured)
+if(configured)
return()
-endif(${BP_PACKAGE}_configured)
-set(${BP_PACKAGE}_configured ON)
+endif(configured)
+set(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)
+set(EPA_CMAKE_DIR v2.8)
+set(EPA_CMAKE_VERSION 2.8.11.1)
+set(URL http://www.cmake.org/files/${EPA_CMAKE_DIR}/cmake-${EPA_CMAKE_VERSION}.tar.gz)
+set(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}")
+ set(EPA_PATH_NODLL "${EPA_PATH}")
+ set(EPA_PATH "${EPA_BASE}/Build/build_${PACKAGE}/dll;${EPA_PATH_NODLL}")
+ determine_msys_path(EPA_PATH "${EPA_PATH}")
+ determine_msys_path(${PACKAGE}_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
else(MSYS_PLATFORM)
- set(${BP_PACKAGE}_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+ set(${PACKAGE}_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+#message(STATUS "modified EPA_PATH for ${PACKAGE} = ${EPA_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
+ build_${PACKAGE}
+ URL ${URL}
+ URL_MD5 ${URL_MD5}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} CFLAGS=-O3 CXXFLAGS=-O3 ${SH_EXECUTABLE} ${EPA_BASE}/Source/build_${PACKAGE}/bootstrap --prefix=${${PACKAGE}_INSTALL_PREFIX} --parallel=8
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_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}")
+list(APPEND build_target_LIST build_${PACKAGE})
+# Restore EPA_PATH to original state.
+set(EPA_PATH "${EPA_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${PACKAGE} restored original EPA_PATH = ${EPA_PATH}")
Modified: trunk/cmake/epa_build/docbook-xml/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/docbook-xml/CMakeLists.txt 2013-12-02 07:19:58 UTC (rev 12800)
+++ trunk/cmake/epa_build/docbook-xml/CMakeLists.txt 2013-12-02 07:25:56 UTC (rev 12801)
@@ -1,4 +1,4 @@
-# docbook-xml/bp.cmake
+# docbook-xml/CMakeLists.txt
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of docbook-xml.
@@ -19,8 +19,8 @@
# 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
+# have run "include(ExternalProject)" and set EPA_BASE variable (and
+# corresponding directory property) as well as various EPA variables
# used below that configure how the External_Project functions
# operate.
@@ -32,71 +32,71 @@
# 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(EPA_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})
+ list(REMOVE_ITEM docbook-xml_dependencies_LIST ${EPA_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)
+ if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
+ include(${build_configuration}/CMakeLists.txt)
list(APPEND docbook-xml_dependencies_targets build_${build_configuration})
- else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
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)
+ endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
endforeach(build_configuration ${docbook-xml_dependences_LIST})
# This can be safely done only after above includes.
-set(BP_PACKAGE docbook-xml)
+set(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)
+set(URL http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip)
+set(${PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
+set(${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}")
+ #set(EPA_PATH_NODLL "${EPA_PATH}")
+ #set(EPA_PATH "${EPA_BASE}/Build/build_${PACKAGE}/dll;${EPA_PATH_NODLL}")
+ determine_msys_path(EPA_PATH "${EPA_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}")
+ determine_msys_path(source_PATH "${EPA_BASE}/Source/build_${PACKAGE}")
+ set(${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}")
+ set(source_PATH "${EPA_BASE}/Source/build_${PACKAGE}")
+ set(${PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+#message(STATUS "modified EPA_PATH for ${PACKAGE} = ${EPA_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_${PACKAGE}
+ DEPENDS ${${PACKAGE}_dependencies_targets}
+ URL ${URL}
+ URL_HASH ${${PACKAGE}_DOWNLOAD_HASH_TYPE}=${${PACKAGE}_DOWNLOAD_HASH}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_CMAKE_COMMAND} ${EPA_BASE}/Source/build_${PACKAGE}
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
BUILD_IN_SOURCE OFF
- INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_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
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${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}"
+ ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
+ COMMENT "Custom updating of ${PACKAGE}"
DEPENDS
- ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}_CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${PACKAGE}/${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}")
+list(APPEND build_target_LIST build_${PACKAGE})
+# Restore EPA_PATH to original state.
+set(EPA_PATH "${EPA_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${PACKAGE} restored original EPA_PATH = ${EPA_PATH}")
Modified: trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt 2013-12-02 07:19:58 UTC (rev 12800)
+++ trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt 2013-12-02 07:25:56 UTC (rev 12801)
@@ -1,4 +1,4 @@
-# docbook-xsl/bp.cmake
+# docbook-xsl/CMakeLists.txt
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of docbook-xsl.
@@ -19,8 +19,8 @@
# 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
+# have run "include(ExternalProject)" and set EPA_BASE variable (and
+# corresponding directory property) as well as various EPA variables
# used below that configure how the External_Project functions
# operate.
@@ -32,71 +32,71 @@
# 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(EPA_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})
+ list(REMOVE_ITEM docbook-xsl_dependencies_LIST ${EPA_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)
+ if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
+ include(${build_configuration}/CMakeLists.txt)
list(APPEND docbook-xsl_dependencies_targets build_${build_configuration})
- else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
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)
+ endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
endforeach(build_configuration ${docbook-xsl_dependences_LIST})
# This can be safely done only after above includes.
-set(BP_PACKAGE docbook-xsl)
+set(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)
+set(URL http://downloads.sourceforge.net/docbook/docbook-xsl-1.78.1.tar.bz2)
+set(${PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
+set(${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}")
+ #set(EPA_PATH_NODLL "${EPA_PATH}")
+ #set(EPA_PATH "${EPA_BASE}/Build/build_${PACKAGE}/dll;${EPA_PATH_NODLL}")
+ determine_msys_path(EPA_PATH "${EPA_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}")
+ determine_msys_path(source_PATH "${EPA_BASE}/Source/build_${PACKAGE}")
+ set(${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}")
+ set(source_PATH "${EPA_BASE}/Source/build_${PACKAGE}")
+ set(${PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+#message(STATUS "modified EPA_PATH for ${PACKAGE} = ${EPA_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_${PACKAGE}
+ DEPENDS ${${PACKAGE}_dependencies_targets}
+ URL ${URL}
+ URL_HASH ${${PACKAGE}_DOWNLOAD_HASH_TYPE}=${${PACKAGE}_DOWNLOAD_HASH}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_CMAKE_COMMAND} ${EPA_BASE}/Source/build_${PACKAGE}
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
BUILD_IN_SOURCE OFF
- INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_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
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${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}"
+ ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
+ COMMENT "Custom updating of ${PACKAGE}"
DEPENDS
- ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}_CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${PACKAGE}/${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}")
+list(APPEND build_target_LIST build_${PACKAGE})
+# Restore EPA_PATH to original state.
+set(EPA_PATH "${EPA_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${PACKAGE} restored original EPA_PATH = ${EPA_PATH}")
Modified: trunk/cmake/epa_build/itcl3/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/itcl3/CMakeLists.txt 2013-12-02 07:19:58 UTC (rev 12800)
+++ trunk/cmake/epa_build/itcl3/CMakeLists.txt 2013-12-02 07:25:56 UTC (rev 12801)
@@ -1,4 +1,4 @@
-# itcl3/bp.cmake
+# itcl3/CMakeLists.txt
# CMakeLists.txt file to configure the build of itcl3.
# Copyright (C) 2013 Alan W. Irwin
@@ -18,8 +18,8 @@
# 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
+# have run "include(ExternalProject)" and set EPA_BASE variable (and
+# corresponding directory property) as well as various EPA variables
# used below that configure how the External_Project functions
# operate.
@@ -34,74 +34,74 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST ${extra_ignored_dependencies_list})
+set(EPA_ignored_dependencies_LIST ${extra_ignored_dependencies_list})
set(itcl3_dependencies_LIST tk tcl)
# Remove dependencies that should be ignored.
if(itcl3_dependencies_LIST)
- list(REMOVE_ITEM itcl3_dependencies_LIST ${BP_ignored_dependencies_LIST})
+ list(REMOVE_ITEM itcl3_dependencies_LIST ${EPA_ignored_dependencies_LIST})
endif(itcl3_dependencies_LIST)
set(itcl3_dependencies_targets)
foreach(build_configuration ${itcl3_dependencies_LIST})
- if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
- include(${build_configuration}/bp.cmake)
+ if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
+ include(${build_configuration}/CMakeLists.txt)
list(APPEND itcl3_dependencies_targets build_${build_configuration})
- else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of itcl3 has been installed another way.")
- endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
endforeach(build_configuration ${itcl3_dependences_LIST})
# This can be safely done only after above includes.
-set(BP_PACKAGE itcl3)
+set(PACKAGE itcl3)
# Data that is related to downloads.
set(ITCL3_VERSION 3.4.1)
set(ITCL3_LIBVERSION 3.4)
-set(${BP_PACKAGE}_URL http://downloads.sourceforge.net/project/incrtcl/%5bIncr%20Tcl_Tk%5d-source/${ITCL3_VERSION}/itcl${ITCL3_VERSION}.tar.gz)
-set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
-set(${BP_PACKAGE}_DOWNLOAD_HASH e7c98e0f69df1a675073ddd3344f0b7f)
+set(URL http://downloads.sourceforge.net/project/incrtcl/%5bIncr%20Tcl_Tk%5d-source/${ITCL3_VERSION}/itcl${ITCL3_VERSION}.tar.gz)
+set(${PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
+set(${PACKAGE}_DOWNLOAD_HASH e7c98e0f69df1a675073ddd3344f0b7f)
# 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}")
+ #set(EPA_PATH_NODLL "${EPA_PATH}")
+ #set(EPA_PATH "${EPA_BASE}/Build/build_${PACKAGE}/dll;${EPA_PATH_NODLL}")
+ determine_msys_path(EPA_PATH "${EPA_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}")
+ determine_msys_path(source_PATH "${EPA_BASE}/Source/build_${PACKAGE}")
+ set(${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}")
+ set(source_PATH "${EPA_BASE}/Source/build_${PACKAGE}")
+ set(${PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+#message(STATUS "modified EPA_PATH for ${PACKAGE} = ${EPA_PATH}")
# Eliminate this option which gives bad results for this package.
-string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CFLAGS "${${BP_PACKAGE}_SET_CFLAGS}")
+string(REGEX REPLACE "-fvisibility=hidden" "" ${PACKAGE}_SET_CFLAGS "${${PACKAGE}_SET_CFLAGS}")
-if(BP_HAVE_64_BIT_OS)
+if(EPA_HAVE_64_BIT_OS)
set(ITCL3_ENABLE_64_BIT --enable-64bit)
-endif(BP_HAVE_64_BIT_OS)
+endif(EPA_HAVE_64_BIT_OS)
# This variable provides the opportunity to set an alternative install
# prefix to distinguish what files are installed by version 3 of itcl
# and friends from what is installed by version 4 of itcl and friends.
# But currently just use the ordinary install location.
-set(INCRTCL3_PREFIX ${BP_CMAKE_INSTALL_PREFIX})
+set(INCRTCL3_PREFIX ${EPA_CMAKE_INSTALL_PREFIX})
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} ${source_PATH}/configure --prefix=${INCRTCL3_PREFIX} --exec-prefix=${INCRTCL3_PREFIX} --includedir=${INCRTCL3_PREFIX}/include/itcl${ITCL3_LIBVERSION} --mandir=${INCRTCL3_PREFIX}/share/man ${ITCL3_ENABLE_64_BIT} --with-tcl=${BP_CMAKE_INSTALL_PREFIX}/lib --with-tclinclude=${BP_CMAKE_INSTALL_PREFIX}/include
- BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
- INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install
+ build_${PACKAGE}
+ DEPENDS ${${PACKAGE}_dependencies_targets}
+ URL ${URL}
+ URL_HASH ${${PACKAGE}_DOWNLOAD_HASH_TYPE}=${${PACKAGE}_DOWNLOAD_HASH}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${${PACKAGE}_SET_CFLAGS} ${source_PATH}/configure --prefix=${INCRTCL3_PREFIX} --exec-prefix=${INCRTCL3_PREFIX} --includedir=${INCRTCL3_PREFIX}/include/itcl${ITCL3_LIBVERSION} --mandir=${INCRTCL3_PREFIX}/share/man ${ITCL3_ENABLE_64_BIT} --with-tcl=${EPA_CMAKE_INSTALL_PREFIX}/lib --with-tclinclude=${EPA_CMAKE_INSTALL_PREFIX}/include
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
)
add_custom_command(
OUTPUT
- ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-build
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-build
COMMAND echo "Replace build-tree locations by install-tree locations"
COMMAND ${SED_EXECUTABLE}
# Cover two different patterns of uppercasing.
@@ -117,14 +117,14 @@
add_custom_command(
OUTPUT
- ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-install
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-install
COMMAND ${CMAKE_COMMAND} -E echo "Install-tree fixups"
COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${INCRTCL3_PREFIX}/lib/itcl${ITCL3_LIBVERSION}/libitcl${ITCL3_LIBVERSION}.so
COMMAND ${CMAKE_COMMAND} -E rename ${INCRTCL3_PREFIX}/lib/itclConfig.sh ${INCRTCL3_PREFIX}/lib/itcl${ITCL3_LIBVERSION}/itclConfig.sh
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}")
+list(APPEND build_target_LIST build_${PACKAGE})
+# Restore EPA_PATH to original state.
+set(EPA_PATH "${EPA_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${PACKAGE} restored original EPA_PATH = ${EPA_PATH}")
Modified: trunk/cmake/epa_build/itk/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/itk/CMakeLists.txt 2013-12-02 07:19:58 UTC (rev 12800)
+++ trunk/cmake/epa_build/itk/CMakeLists.txt 2013-12-02 07:25:56 UTC (rev 12801)
@@ -1,4 +1,4 @@
-# itk/bp.cmake
+# itk/CMakeLists.txt
# CMakeLists.txt file to configure the build of itk.
# Copyright (C) 2013 Alan W. Irwin
@@ -18,8 +18,8 @@
# 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
+# have run "include(ExternalProject)" and set EPA_BASE variable (and
+# corresponding directory property) as well as various EPA variables
# used below that configure how the External_Project functions
# operate.
@@ -34,99 +34,99 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST ${extra_ignored_dependencies_list})
+set(EPA_ignored_dependencies_LIST ${extra_ignored_dependencies_list})
set(itk_dependencies_LIST tk tcl)
# Remove dependencies that should be ignored.
if(itk_dependencies_LIST)
- list(REMOVE_ITEM itk_dependencies_LIST ${BP_ignored_dependencies_LIST})
+ list(REMOVE_ITEM itk_dependencies_LIST ${EPA_ignored_dependencies_LIST})
endif(itk_dependencies_LIST)
set(itk_dependencies_targets)
foreach(build_configuration ${itk_dependencies_LIST})
- if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
- include(${build_configuration}/bp.cmake)
+ if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
+ include(${build_configuration}/CMakeLists.txt)
list(APPEND itk_dependencies_targets build_${build_configuration})
- else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of itk has been installed another way.")
- endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
endforeach(build_configuration ${itk_dependences_LIST})
# This can be safely done only after above includes.
-set(BP_PACKAGE itk)
+set(PACKAGE itk)
# Data that is related to downloads.
set(ITCL_ITK_VERSION 4.0.0)
set(ITCL_ITK_LIBVERSION ${ITCL_ITK_VERSION})
-set(${BP_PACKAGE}_URL http://downloads.sourceforge.net/project/incrtcl/%5bincr%20Tcl_Tk%5d-4-source/Itcl%20${ITCL_ITK_VERSION}/itk${ITCL_ITK_VERSION}.tar.gz)
-set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
-set(${BP_PACKAGE}_DOWNLOAD_HASH e3600a9ad0fcdcbbc4138af5a4893b7e)
+set(URL http://downloads.sourceforge.net/project/incrtcl/%5bincr%20Tcl_Tk%5d-4-source/Itcl%20${ITCL_ITK_VERSION}/itk${ITCL_ITK_VERSION}.tar.gz)
+set(${PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
+set(${PACKAGE}_DOWNLOAD_HASH e3600a9ad0fcdcbbc4138af5a4893b7e)
# 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}")
+ #set(EPA_PATH_NODLL "${EPA_PATH}")
+ #set(EPA_PATH "${EPA_BASE}/Build/build_${PACKAGE}/dll;${EPA_PATH_NODLL}")
+ determine_msys_path(EPA_PATH "${EPA_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}")
+ determine_msys_path(source_PATH "${EPA_BASE}/Source/build_${PACKAGE}")
+ set(${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}")
+ set(source_PATH "${EPA_BASE}/Source/build_${PACKAGE}")
+ set(${PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+#message(STATUS "modified EPA_PATH for ${PACKAGE} = ${EPA_PATH}")
-if(BP_HAVE_64_BIT_OS)
+if(EPA_HAVE_64_BIT_OS)
set(ITK_ENABLE_64_BIT --enable-64bit)
-endif(BP_HAVE_64_BIT_OS)
+endif(EPA_HAVE_64_BIT_OS)
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}
+ build_${PACKAGE}
+ DEPENDS ${${PACKAGE}_dependencies_targets}
+ URL ${URL}
+ URL_HASH ${${PACKAGE}_DOWNLOAD_HASH_TYPE}=${${PACKAGE}_DOWNLOAD_HASH}
PATCH_COMMAND ""
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} CPPFLAGS=-I${BP_CMAKE_INSTALL_PREFIX}/include ${source_PATH}/${BP_CONFIGURE_COMMAND} --mandir=${BP_CMAKE_INSTALL_PREFIX}/share/man ${ITK_ENABLE_64_BIT} --with-itcl=${BP_CMAKE_INSTALL_PREFIX}/lib/itcl${ITCL_ITK_LIBVERSION}
- BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
- INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${${PACKAGE}_SET_CFLAGS} CPPFLAGS=-I${EPA_CMAKE_INSTALL_PREFIX}/include ${source_PATH}/${EPA_CONFIGURE_COMMAND} --mandir=${EPA_CMAKE_INSTALL_PREFIX}/share/man ${ITK_ENABLE_64_BIT} --with-itcl=${EPA_CMAKE_INSTALL_PREFIX}/lib/itcl${ITCL_ITK_LIBVERSION}
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
)
add_custom_command(
OUTPUT
- ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-patch
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
COMMAND ${CMAKE_COMMAND} -E echo
"Provide an exactly equivalent \"Itk\" and \"itk\" form of the package name to follow what is implemented for itcl version 4."
# This patch has been publicly distributed at https://sourceforge.net/p/incrtcl/patches/52/
- COMMAND ${PATCH_EXECUTABLE} --directory=${EP_BASE}/Source/build_${BP_PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/itk4_case.patch
+ COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${PACKAGE}/itk4_case.patch
COMMAND ${CMAKE_COMMAND} -E echo
"Add generic/itkDecls.h to the list of itk headers that must be installed."
# This patch has been publicly distributed at https://sourceforge.net/p/incrtcl/patches/53/
- COMMAND ${PATCH_EXECUTABLE} --directory=${EP_BASE}/Source/build_${BP_PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/itk4_header_list.patch
+ COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${PACKAGE}/itk4_header_list.patch
APPEND
)
add_custom_command(
OUTPUT
- ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-build
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-build
COMMAND echo "Replace build-tree locations by install-tree locations"
COMMAND ${SED_EXECUTABLE}
- -e "s@^\\(ITK_SRC_DIR='\\).*@\\1${BP_CMAKE_INSTALL_PREFIX}/include'@"
+ -e "s@^\\(ITK_SRC_DIR='\\).*@\\1${EPA_CMAKE_INSTALL_PREFIX}/include'@"
# Comment out the next since itk build system does not configure any
# of these variables so they are left in symbolic "@" form.
- #-e "/ITK_B/s@='\\(-L\\)\\?.*build_itk@='\\1${BP_CMAKE_INSTALL_PREFIX}/lib@"
+ #-e "/ITK_B/s@='\\(-L\\)\\?.*build_itk@='\\1${EPA_CMAKE_INSTALL_PREFIX}/lib@"
-i itkConfig.sh
APPEND
)
add_custom_command(
OUTPUT
- ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-install
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-install
COMMAND echo "Install-tree fixups"
- COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${BP_CMAKE_INSTALL_PREFIX}/lib/itk${ITCL_ITK_LIBVERSION}/libitk${ITCL_ITK_LIBVERSION}.so
+ COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${EPA_CMAKE_INSTALL_PREFIX}/lib/itk${ITCL_ITK_LIBVERSION}/libitk${ITCL_ITK_LIBVERSION}.so
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}")
+list(APPEND build_target_LIST build_${PACKAGE})
+# Restore EPA_PATH to original state.
+set(EPA_PATH "${EPA_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${PACKAGE} restored original EPA_PATH = ${EPA_PATH}")
Modified: trunk/cmake/epa_build/itk3/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/itk3/CMakeLists.txt 2013-12-02 07:19:58 UTC (rev 12800)
+++ trunk/cmake/epa_build/itk3/CMakeLists.txt 2013-12-02 07:25:56 UTC (rev 12801)
@@ -1,4 +1,4 @@
-# itk3/bp.cmake
+# itk3/CMakeLists.txt
# CMakeLists.txt file to configure the build of itk3.
# Copyright (C) 2013 Alan W. Irwin
@@ -18,8 +18,8 @@
# 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
+# have run "include(ExternalProject)" and set EPA_BASE variable (and
+# corresponding directory property) as well as various EPA variables
# used below that configure how the External_Project functions
# operate.
@@ -34,70 +34,70 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST ${extra_ignored_dependencies_list})
+set(EPA_ignored_dependencies_LIST ${extra_ignored_dependencies_list})
set(itk3_dependencies_LIST itcl3 tk tcl)
# Remove dependencies that should be ignored.
if(itk3_dependencies_LIST)
- list(REMOVE_ITEM itk3_dependencies_LIST ${BP_ignored_dependencies_LIST})
+ list(REMOVE_ITEM itk3_dependencies_LIST ${EPA_ignored_dependencies_LIST})
endif(itk3_dependencies_LIST)
set(itk3_dependencies_targets)
foreach(build_configuration ${itk3_dependencies_LIST})
- if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
- include(${build_configuration}/bp.cmake)
+ if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
+ include(${build_configuration}/CMakeLists.txt)
list(APPEND itk3_dependencies_targets build_${build_configuration})
- else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of itk3 has been installed another way.")
- endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
endforeach(build_configuration ${itk3_dependences_LIST})
# This can be safely done only after above includes.
-set(BP_PACKAGE itk3)
+set(PACKAGE itk3)
# Data that is related to downloads.
set(ITK3_VERSION 3.3)
set(ITK3_LIBVERSION 3.3)
-set(${BP_PACKAGE}_URL http://downloads.sourceforge.net/project/incrtcl/%5bIncr%20Tcl_Tk%5d-source/${ITK3_VERSION}-RC/itk${ITK3_VERSION}.tar.gz)
-set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
-set(${BP_PACKAGE}_DOWNLOAD_HASH a97c17f3cfa5e377f43073c653c501b5)
+set(URL http://downloads.sourceforge.net/project/incrtcl/%5bIncr%20Tcl_Tk%5d-source/${ITK3_VERSION}-RC/itk${ITK3_VERSION}.tar.gz)
+set(${PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
+set(${PACKAGE}_DOWNLOAD_HASH a97c17f3cfa5e377f43073c653c501b5)
# 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}")
+ #set(EPA_PATH_NODLL "${EPA_PATH}")
+ #set(EPA_PATH "${EPA_BASE}/Build/build_${PACKAGE}/dll;${EPA_PATH_NODLL}")
+ determine_msys_path(EPA_PATH "${EPA_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}")
+ determine_msys_path(source_PATH "${EPA_BASE}/Source/build_${PACKAGE}")
+ set(${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}")
+ set(source_PATH "${EPA_BASE}/Source/build_${PACKAGE}")
+ set(${PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+#message(STATUS "modified EPA_PATH for ${PACKAGE} = ${EPA_PATH}")
# Eliminate this option which gives bad results for this package.
-string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CFLAGS "${${BP_PACKAGE}_SET_CFLAGS}")
+string(REGEX REPLACE "-fvisibility=hidden" "" ${PACKAGE}_SET_CFLAGS "${${PACKAGE}_SET_CFLAGS}")
-if(BP_HAVE_64_BIT_OS)
+if(EPA_HAVE_64_BIT_OS)
set(ITK3_ENABLE_64_BIT --enable-64bit)
-endif(BP_HAVE_64_BIT_OS)
+endif(EPA_HAVE_64_BIT_OS)
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}
+ build_${PACKAGE}
+ DEPENDS ${${PACKAGE}_dependencies_targets}
+ URL ${URL}
+ URL_HASH ${${PACKAGE}_DOWNLOAD_HASH_TYPE}=${${PACKAGE}_DOWNLOAD_HASH}
# Order of CPPFLAGS is important since want to access the version 3
# itcl header.
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} "CPPFLAGS=-I${INCRTCL3_PREFIX}/include/itcl${ITCL3_LIBVERSION} -I${BP_CMAKE_INSTALL_PREFIX}/include" ${source_PATH}/configure --prefix=${INCRTCL3_PREFIX} --exec-prefix=${INCRTCL3_PREFIX} --includedir=${INCRTCL3_PREFIX}/include/itcl${ITCL3_LIBVERSION} --mandir=${INCRTCL3_PREFIX}/share/man ${ITK3_ENABLE_64_BIT} --with-tcl=${BP_CMAKE_INSTALL_PREFIX}/lib --with-tk=${BP_CMAKE_INSTALL_PREFIX}/lib --with-itcl=${INCRTCL3_PREFIX}/lib/itcl${ITCL3_LIBVERSION}
- BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
- INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${${PACKAGE}_SET_CFLAGS} "CPPFLAGS=-I${INCRTCL3_PREFIX}/include/itcl${ITCL3_LIBVERSION} -I${EPA_CMAKE_INSTALL_PREFIX}/include" ${source_PATH}/configure --prefix=${INCRTCL3_PREFIX} --exec-prefix=${INCRTCL3_PREFIX} --includedir=${INCRTCL3_PREFIX}/include/itcl${ITCL3_LIBVERSION} --mandir=${INCRTCL3_PREFIX}/share/man ${ITK3_ENABLE_64_BIT} --with-tcl=${EPA_CMAKE_INSTALL_PREFIX}/lib --with-tk=${EPA_CMAKE_INSTALL_PREFIX}/lib --with-itcl=${INCRTCL3_PREFIX}/lib/itcl${ITCL3_LIBVERSION}
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
)
add_custom_command(
OUTPUT
- ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-build
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-build
COMMAND echo "Replace build-tree locations by install-tree locations"
COMMAND ${SED_EXECUTABLE}
# Cover two different patterns of uppercasing.
@@ -113,14 +113,14 @@
add_custom_command(
OUTPUT
- ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-install
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-install
COMMAND echo "Install-tree fixups"
COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${INCRTCL3_PREFIX}/lib/itk${ITK3_LIBVERSION}/libitk${ITK3_LIBVERSION}.so
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}")
+list(APPEND build_target_LIST build_${PACKAGE})
+# Restore EPA_PATH to original state.
+set(EPA_PATH "${EPA_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${PACKAGE} restored original EPA_PATH = ${EPA_PATH}")
Modified: trunk/cmake/epa_build/iwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/iwidgets/CMakeLists.txt 2013-12-02 07:19:58 UTC (rev 12800)
+++ trunk/cmake/epa_build/iwidgets/CMakeLists.txt 2013-12-02 07:25:56 UTC (rev 12801)
@@ -1,4 +1,4 @@
-# iwidgets/bp.cmake
+# iwidgets/CMakeLists.txt
# CMakeLists.txt file to configure the build of iwidgets4.0 and iwidgets
# Copyright (C) 2013 Alan W. Irwin
@@ -18,8 +18,8 @@
# 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
+# have run "include(ExternalProject)" and set EPA_BASE variable (and
+# corresponding directory property) as well as various EPA variables
# used below that configure how the External_Project functions
# operate.
@@ -31,7 +31,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST ${extra_ignored_dependencies_list})
+set(EPA_ignored_dependencies_LIST ${extra_ignored_dependencies_list})
set(iwidgets4.0_dependencies_LIST itk3 itcl3 tk tcl)
set(iwidgets_dependencies_LIST itk tk tcl)
@@ -40,61 +40,61 @@
foreach(tag IN LISTS tags)
# Remove dependencies that should be ignored.
if(iwidgets${tag}_dependencies_LIST)
- list(REMOVE_ITEM iwidgets${tag}_dependencies_LIST ${BP_ignored_dependencies_LIST})
+ list(REMOVE_ITEM iwidgets${tag}_dependencies_LIST ${EPA_ignored_dependencies_LIST})
endif(iwidgets${tag}_dependencies_LIST)
set(iwidgets${tag}_dependencies_targets)
foreach(build_configuration ${iwidgets${tag}_dependencies_LIST})
- if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
- include(${build_configuration}/bp.cmake)
+ if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
+ include(${build_configuration}/CMakeLists.txt)
list(APPEND iwidgets${tag}_dependencies_targets build_${build_configuration})
- else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of iwidgets${tag} has been installed another way.")
- endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/CMakeLists.txt)
endforeach(build_configuration ${iwidgets${tag}_dependences_LIST})
endforeach(tag IN LISTS tags)
# This can be safely done only after above includes.
-set(BP_PACKAGE iwidgets)
+set(PACKAGE iwidgets)
-set(${BP_PACKAGE}4.0_VERSION 4.0.1)
-set(${BP_PACKAGE}4.0_LIBVERSION 4.0)
-set(${BP_PACKAGE}4.0_ITCL_VERSION 3.2)
-set(${BP_PACKAGE}4.0_CMAKE_OPTION -DBUILD_IWIDGETS_4.1=OFF)
+set(${PACKAGE}4.0_VERSION 4.0.1)
+set(${PACKAGE}4.0_LIBVERSION 4.0)
+set(${PACKAGE}4.0_ITCL_VERSION 3.2)
+set(${PACKAGE}4.0_CMAKE_OPTION -DBUILD_IWIDGETS_4.1=OFF)
-set(${BP_PACKAGE}_VERSION 4.1.0)
-set(${BP_PACKAGE}_LIBVERSION 4.1)
-set(${BP_PACKAGE}_ITCL_VERSION 4.0)
-set(${BP_PACKAGE}_CMAKE_OPTION -DBUILD_IWIDGETS_4.1=ON)
+set(${PACKAGE}_VERSION 4.1.0)
+set(${PACKAGE}_LIBVERSION 4.1)
+set(${PACKAGE}_ITCL_VERSION 4.0)
+set(${PACKAGE}_CMAKE_OPTION -DBUILD_IWIDGETS_4.1=ON)
foreach(tag IN LISTS tags)
# Data that is related to downloads.
- set(${BP_PACKAGE}${tag}_URL http://downloads.sourceforge.net/project/incrtcl/%5bIncr%20Widgets%5d/${${BP_PACKAGE}4.0_VERSION}/iwidgets${${BP_PACKAGE}4.0_VERSION}.tar.gz)
- set(${BP_PACKAGE}${tag}_DOWNLOAD_HASH_TYPE MD5)
- set(${BP_PACKAGE}${tag}_DOWNLOAD_HASH 0e9c140e81ea6015b56130127c7deb03)
+ set(${PACKAGE}${tag}_URL http://downloads.sourceforge.net/project/incrtcl/%5bIncr%20Widgets%5d/${${PACKAGE}4.0_VERSION}/iwidgets${${PACKAGE}4.0_VERSION}.tar.gz)
+ set(${PACKAGE}${tag}_DOWNLOAD_HASH_TYPE MD5)
+ set(${PACKAGE}${tag}_DOWNLOAD_HASH 0e9c140e81ea6015b56130127c7deb03)
# 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}${tag}/dll;${BP_PATH_NODLL}")
- determine_msys_path(BP_PATH "${BP_PATH}")
+ #set(EPA_PATH_NODLL "${EPA_PATH}")
+ #set(EPA_PATH "${EPA_BASE}/Build/build_${PACKAGE}${tag}/dll;${EPA_PATH_NODLL}")
+ determine_msys_path(EPA_PATH "${EPA_PATH}")
# Must have all elements of env command in MSYS platform form
- determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}${tag}")
+ determine_msys_path(source_PATH "${EPA_BASE}/Source/build_${PACKAGE}${tag}")
else(MSYS_PLATFORM)
- set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}${tag}")
+ set(source_PATH "${EPA_BASE}/Source/build_${PACKAGE}${tag}")
endif(MSYS_PLATFORM)
- #message(STATUS "modified BP_PATH for ${BP_PACKAGE}${tag} = ${BP_PATH}")
+ #message(STATUS "modified EPA_PATH for ${PACKAGE}${tag} = ${EPA_PATH}")
ExternalProject_Add(
- build_${BP_PACKAGE}${tag}
- DEPENDS ${${BP_PACKAGE}${tag}_dependencies_targets}
- URL ${${BP_PACKAGE}${tag}_URL}
- URL_HASH ${${BP_PACKAGE}${tag}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}${tag}_DOWNLOAD_HASH}
+ build_${PACKAGE}${tag}
+ DEPENDS ${${PACKAGE}${tag}_dependencies_targets}
+ URL ${${PACKAGE}${tag}_URL}
+ URL_HASH ${${PACKAGE}${tag}_DOWNLOAD_HASH_TYPE}=${${PACKAGE}${tag}_DOWNLOAD_HASH}
PATCH_COMMAND ""
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} ${${BP_PACKAGE}${tag}_CMAKE_OPTION} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
- BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
- INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_CMAKE_COMMAND} ${${PACKAGE}${tag}_CMAKE_OPTION} ${EPA_BASE}/Source/build_${PACKAGE}${tag}
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
)
if(NOT "${tag}")
# Note this logic block executed for iwidget4.1 which has an empty
@@ -118,26 +118,26 @@
# anywhere on the net) rather than iwidgets-4.0.1.
add_custom_command(
OUTPUT
- ${EP_BASE}/Stamp/build_${BP_PACKAGE}${tag}/build_${BP_PACKAGE}${tag}-patch
+ ${EPA_BASE}/Stamp/build_${PACKAGE}${tag}/build_${PACKAGE}${tag}-patch
COMMAND echo "Apply iwidgets4.1 source code patch"
- COMMAND ${PATCH_EXECUTABLE} --directory=${EP_BASE}/Source/build_${BP_PACKAGE}${tag} -p1 < ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}4.1.patch
+ COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE}${tag} -p1 < ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}4.1.patch
COMMAND echo "Apply patch to support both iwidgets and Iwidgets package names"
- COMMAND ${PATCH_EXECUTABLE} --directory=${EP_BASE}/Source/build_${BP_PACKAGE}${tag} -p1 < ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}4_case.patch
+ COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE}${tag} -p1 < ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}4_case.patch
APPEND
)
endif(NOT "${tag}")
add_custom_command(
OUTPUT
- ${EP_BASE}/Stamp/build_${BP_PACKAGE}${tag}/build_${BP_PACKAGE}${tag}-patch
+ ${EPA_BASE}/Stamp/build_${PACKAGE}${tag}/build_${PACKAGE}${tag}-patch
COMMAND echo "Add CMake-based build system"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
- ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}_CMakeLists.txt
- ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${EPA_BASE}/Source/build_${PACKAGE}${tag}/CMakeLists.txt
APPEND
)
- list(APPEND build_target_LIST build_${BP_PACKAGE}${tag})
- # Restore BP_PATH to original state.
- set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
- #message(STATUS "${BP_PACKAGE}${tag} restored original BP_PATH = ${BP_PATH}")
+ list(APPEND build_target_LIST build_${PACKAGE}${tag})
+ # Restore EPA_PATH to original state.
+ set(EPA_PATH "${EPA_ORIGINAL_NATIVE_PATH}")
+ #message(STATUS "${PACKAGE}${tag} restored original EPA_PATH = ${EPA_PATH}")
endforeach(tag IN LISTS tags)
Modified: trunk/cmake/epa_build/libagg/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libagg/CMakeLists.txt 2013-12-02 07:19:58 UTC (rev 12800)
+++ trunk/cmake/epa_build/libagg/CMakeLists.txt 2013-12-02 07:25:56 UTC (rev 12801)
@@ -1,4 +1,4 @@
-# libagg/bp.cmake
+# libagg/CMakeLists.txt
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of libagg.
@@ -19,54 +19,54 @@
# 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
+# have run "include(ExternalProject)" and set EPA_BASE variable (and
+# corresponding directory property) as well as various EPA variables
# used below that configure how the External_Project functions
# operate.
-set(BP_PACKAGE libagg)
+set(PACKAGE libagg)
# Protect against configuring a build twice in one CMake call
-if(${BP_PACKAGE}_configured)
+if(configured)
return()
-endif(${BP_PACKAGE}_configured)
-set(${BP_PACKAGE}_configured ON)
+endif(configured)
+set(configured ON)
# Data that is related to downloads.
-set(${BP_PACKAGE}_URL http://www.antigrain.com/agg-2.5.tar.gz)
-set(${BP_PACKAGE}_URL_MD5 0229a488bc47be10a2fee6cf0b2febd6)
+set(URL http://www.antigrain.com/agg-2.5.tar.gz)
+set(URL_MD5 0229a488bc47be10a2fee6cf0b2febd6)
# 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}")
+ #set(EPA_PATH_NODLL "${EPA_PATH}")
+ #set(EPA_PATH "${EPA_BASE}/Build/build_${PACKAGE}/dll;${EPA_PATH_NODLL}")
+ determine_msys_path(EPA_PATH "${EPA_PATH}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+#message(STATUS "modified EPA_PATH for ${PACKAGE} = ${EPA_PATH}")
ExternalProject_Add(
- build_${BP_PACKAGE}
- URL ${${BP_PACKAGE}_URL}
- URL_MD5 ${${BP_PACKAGE}_URL_MD5}
- 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}
- INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
+ build_${PACKAGE}
+ URL ${URL}
+ URL_MD5 ${URL_MD5}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_CMAKE_COMMAND} ${EPA_BASE}/Source/build_${PACKAGE}
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_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
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${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}"
+ ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+ ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
+ COMMENT "Custom updating of ${PACKAGE}"
DEPENDS
- ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}_CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${PACKAGE}/${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}")
+list(APPEND build_target_LIST build_${PACKAGE})
+# Restore EPA_PATH to original state.
+set(EPA_PATH "${EPA_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${PACKAGE} restored original EPA_PATH = ${EPA_PATH}")
Modified: trunk/cmake/epa_build/libharu/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libharu/CMakeLists.txt 2013-12-02 07:19:58 UTC (rev 12800)
+++ trunk/cmake/epa_build/libharu/CMakeLists.txt 2013-12-02 07:25:56 UTC (rev 12801)
@@ -1,4 +1,4 @@
-# libharu/bp.cmake
+# libharu/CMakeLists.txt
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of libharu.
@@ -19,60 +19,60 @@
# 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
+# have run "include(ExternalProject)" and set EPA_BASE variable (and
+# corresponding directory property) as well as various EPA variables
# used below that configure how the External_Project functions
# operate.
-set(BP_PACKAGE libharu)
+set(PACKAGE libharu)
# Protect against configuring a build twice in one CMake call
-if(${BP_PACKAGE}_configured)
+if(configured)
return()
-endif(${BP_PACKAGE}_configured)
-set(${BP_PACKAGE}_configured ON)
+endif(configured)
+set(configured ON)
# Data that is related to downloads.
-set(${BP_PACKAGE}_URL http://${BP_PACKAGE}.org/files/${BP_PACKAGE}-2.2.1.tar.gz)
-set(${BP_PACKAGE}_URL_MD5 63da8e087744f1d6cf16f9501b1cb766)
+set(URL http://${PACKAGE}.org/files/${PACKAGE}-2.2.1.tar.gz)
+set(URL_MD5 63da8e087744f1d6cf16f9501b1cb766)
# 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}")
+ #set(EPA_PATH_NODLL "${EPA_PATH}")
+ #set(EPA_PATH "${EPA_BASE}/Build/build_${PACKAGE}/dll;${EPA_PATH_NODLL}")
+ determine_msys_path(EPA_PATH "${EPA_PATH}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+#message(STATUS "modified EPA_PATH for ${PACKAGE} = ${EPA_PATH}")
ExternalProject_Add(
- build_${BP_PACKAGE}
- URL ${${BP_PACKAGE}_URL}
- URL_MD5 ${${BP_PACKAGE}_URL_MD5}
+ build_${PACKAGE}
+ URL ${URL}
+ URL_MD5 ${URL_MD5}
PATCH_COMMAND ""
# Do not use -DLIBHARU_EXAMPLES=ON (which builds the demos, but does
# not test them) because latest release does not include demos.
- 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}
- INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_CMAKE_COMMAND} ${EPA_BASE}/Source/build_${PACKAGE}
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
)
add_custom_command(
OUTPUT
- ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-patch
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
COMMAND ${CMAKE_COMMAND} -E echo "Apply all patches"
- COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/cmake.patch
- COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/large_font.patch
- COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/remove_configured.patch
- COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/visibility.patch
+ COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}/cmake.patch
+ COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}/large_font.patch
+ COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}/remove_configured.patch
+ COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}/visibility.patch
DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/cmake.patch
- ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/large_font.patch
- ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/remove_configured.patch
- ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/visibility.patch
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}/cmake.patch
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}/large_font.patch
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}/remove_configured.patch
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}/visibility.patch
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}")
+list(APPEND build_target_LIST build_${PACKAGE})
+# Restore EPA_PATH to original state.
+set(EPA_PATH "${EPA_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${PACKAGE} restored original EPA_PATH = ${EPA_PATH}")
Modified: trunk/cmake/epa_build/libqhull/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libqhull/CMakeLists.txt 2013-12-02 07:19:58 UTC (rev 12800)
+++ trunk/cmake/epa_build/libqhull/CMakeLists.txt 2013-12-02 07:25:56 UTC (rev 12801)
@@ -1,4 +1,4 @@
-# libqhull/bp.cmake
+# libqhull/CMakeLists.txt
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of libqhull.
@@ -19,70 +19,70 @@
# 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
+# have run "include(ExternalProject)" and set EPA_BASE variable (and
+# corresponding directory property) as well as various EPA variables
# used below that configure how the External_Project functions
# operate.
-set(BP_PACKAGE libqhull)
+set(PACKAGE libqhull)
# Protect against configuring a build twice in one CMake call
-if(${BP_PACKAG...
[truncated message content] |
