Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12375] trunk/cmake/build_projects
|
From: <ai...@us...> - 2013-06-07 18:46:57
|
Revision: 12375
http://sourceforge.net/p/plplot/code/12375
Author: airwin
Date: 2013-06-07 18:46:54 +0000 (Fri, 07 Jun 2013)
Log Message:
-----------
Replace software package name by ${BP_PACKAGE} wherever possible to
make ep.cmake files more abstracted/generic.
Modified Paths:
--------------
trunk/cmake/build_projects/libagg/ep.cmake
trunk/cmake/build_projects/libharu/ep.cmake
trunk/cmake/build_projects/libqhull/ep.cmake
trunk/cmake/build_projects/ndiff/ep.cmake
trunk/cmake/build_projects/shapelib/ep.cmake
Modified: trunk/cmake/build_projects/libagg/ep.cmake
===================================================================
--- trunk/cmake/build_projects/libagg/ep.cmake 2013-06-07 16:03:35 UTC (rev 12374)
+++ trunk/cmake/build_projects/libagg/ep.cmake 2013-06-07 18:46:54 UTC (rev 12375)
@@ -1,6 +1,6 @@
# libagg/ep.cmake
# This file should be included directly or indirectly from a top-level
-# CMakeLists.txt file to configure the build and test of libagg.
+# CMakeLists.txt file to configure the build of libagg.
# Copyright (C) 2013 Alan W. Irwin
@@ -24,23 +24,25 @@
# used below that configure how the External_Project functions
# operate.
+set(BP_PACKAGE libagg)
+
# Data that is related to downloads.
-set(libagg_URL http://www.antigrain.com/agg-2.5.tar.gz)
-set(libagg_URL_MD5 0229a488bc47be10a2fee6cf0b2febd6)
+set(${BP_PACKAGE}_URL http://www.antigrain.com/agg-2.5.tar.gz)
+set(${BP_PACKAGE}_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_libagg/dll;${BP_PATH_NODLL}")
+ #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
determine_msys_path(BP_PATH "${BP_PATH}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for libagg = ${BP_PATH}")
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
ExternalProject_Add(
- build_libagg
- URL ${libagg_URL}
- URL_MD5 ${libagg_URL_MD5}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} ${EP_BASE}/Source/build_libagg
+ 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 ${BP_PARALLEL_BUILD_COMMAND}
INSTALL_COMMAND ${BP_PARALLEL_BUILD_COMMAND} install
STEP_TARGETS download update_build_system configure build install
@@ -50,23 +52,23 @@
# rather than time stamps alone.
add_custom_command(
OUTPUT
- ${EP_BASE}/Source/build_libagg/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libagg/CMakeLists.txt
- ${EP_BASE}/Source/build_libagg/CMakeLists.txt
- COMMENT "Updating of libagg build system"
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
+ COMMENT "Updating of ${BP_PACKAGE} build system"
DEPENDS
- ${CMAKE_SOURCE_DIR}/libagg/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
)
-ExternalProject_Add_Step(build_libagg update_build_system
- COMMENT "Updated libagg build system"
+ExternalProject_Add_Step(build_${BP_PACKAGE} update_build_system
+ COMMENT "Updated ${BP_PACKAGE} build system"
DEPENDEES download
DEPENDERS configure
DEPENDS
- ${EP_BASE}/Source/build_libagg/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
ALWAYS OFF
)
# Restore BP_PATH to original state.
set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
-#message(STATUS "libagg restored original BP_PATH = ${BP_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")
Modified: trunk/cmake/build_projects/libharu/ep.cmake
===================================================================
--- trunk/cmake/build_projects/libharu/ep.cmake 2013-06-07 16:03:35 UTC (rev 12374)
+++ trunk/cmake/build_projects/libharu/ep.cmake 2013-06-07 18:46:54 UTC (rev 12375)
@@ -1,6 +1,6 @@
# libharu/ep.cmake
# This file should be included directly or indirectly from a top-level
-# CMakeLists.txt file to configure the build and test of libharu.
+# CMakeLists.txt file to configure the build of libharu.
# Copyright (C) 2013 Alan W. Irwin
@@ -24,26 +24,28 @@
# used below that configure how the External_Project functions
# operate.
+set(BP_PACKAGE libharu)
+
# Data that is related to downloads.
-set(libharu_URL http://libharu.org/files/libharu-2.1.0.tar.gz)
-set(libharu_URL_MD5 0623b8fb08ae1b28af08b2cdbd66b662)
+set(${BP_PACKAGE}_URL http://${BP_PACKAGE}.org/files/${BP_PACKAGE}-2.1.0.tar.gz)
+set(${BP_PACKAGE}_URL_MD5 0623b8fb08ae1b28af08b2cdbd66b662)
# 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_libharu/dll;${BP_PATH_NODLL}")
+ #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
determine_msys_path(BP_PATH "${BP_PATH}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for libharu = ${BP_PATH}")
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
ExternalProject_Add(
- build_libharu
- URL ${libharu_URL}
- URL_MD5 ${libharu_URL_MD5}
+ build_${BP_PACKAGE}
+ URL ${${BP_PACKAGE}_URL}
+ URL_MD5 ${${BP_PACKAGE}_URL_MD5}
# Note -DPOST_2.1.0=OFF is essential for the 2.1.0 version, but you
# should drop this option for anything after 2.1.0. Also note that
- # -DLIBHARU_EXAMPLES=ON builds the demos, but does not test them.
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DPOST_2.1.0=OFF -DLIBHARU_EXAMPLES=ON ${EP_BASE}/Source/build_libharu
+ # -D${BP_PACKAGE}_EXAMPLES=ON builds the demos, but does not test them.
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DPOST_2.1.0=OFF -D${BP_PACKAGE}_EXAMPLES=ON ${EP_BASE}/Source/build_${BP_PACKAGE}
BUILD_COMMAND ${BP_PARALLEL_BUILD_COMMAND}
INSTALL_COMMAND ${BP_PARALLEL_BUILD_COMMAND} install
STEP_TARGETS download update_build_system configure build install test
@@ -53,83 +55,83 @@
# rather than time stamps alone.
add_custom_command(
OUTPUT
- ${EP_BASE}/Source/build_libharu/CMakeLists.txt
- ${EP_BASE}/Source/build_libharu/demo/CMakeLists.txt
- ${EP_BASE}/Source/build_libharu/src/hpdf_page_operator.c
- ${EP_BASE}/Source/build_libharu/src/CMakeLists.txt
- ${EP_BASE}/Source/build_libharu/cmake/modules/haru.cmake
- ${EP_BASE}/Source/build_libharu/cmake/modules/summary.cmake
- ${EP_BASE}/Source/build_libharu/include/hpdf_consts.h
- ${EP_BASE}/Source/build_libharu/include/hpdf_config.h.cmake
- ${EP_BASE}/Source/build_libharu/include/hpdf.h
- ${EP_BASE}/Source/build_libharu/include/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/demo/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/hpdf_page_operator.c
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/cmake/modules/haru.cmake
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/cmake/modules/summary.cmake
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/include/hpdf_consts.h
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/include/hpdf_config.h.cmake
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/include/hpdf.h
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/include/CMakeLists.txt
# File that is patched.
- ${EP_BASE}/Source/build_libharu/src/hpdf_streams.c
- COMMAND ${CMAKE_COMMAND} -E make_directory ${EP_BASE}/Source/build_libharu/cmake/modules
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/hpdf_streams.c
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${EP_BASE}/Source/build_${BP_PACKAGE}/cmake/modules
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libharu/CMakeLists.txt
- ${EP_BASE}/Source/build_libharu/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libharu/demo/CMakeLists.txt
- ${EP_BASE}/Source/build_libharu/demo/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/demo/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/demo/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libharu/src/hpdf_page_operator.c
- ${EP_BASE}/Source/build_libharu/src/hpdf_page_operator.c
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/src/hpdf_page_operator.c
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/hpdf_page_operator.c
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libharu/src/CMakeLists.txt
- ${EP_BASE}/Source/build_libharu/src/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/src/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libharu/cmake/modules/haru.cmake
- ${EP_BASE}/Source/build_libharu/cmake/modules/haru.cmake
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/cmake/modules/haru.cmake
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/cmake/modules/haru.cmake
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libharu/cmake/modules/summary.cmake
- ${EP_BASE}/Source/build_libharu/cmake/modules/summary.cmake
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/cmake/modules/summary.cmake
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/cmake/modules/summary.cmake
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libharu/include/hpdf_consts.h
- ${EP_BASE}/Source/build_libharu/include/hpdf_consts.h
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/include/hpdf_consts.h
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/include/hpdf_consts.h
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libharu/include/hpdf_config.h.cmake
- ${EP_BASE}/Source/build_libharu/include/hpdf_config.h.cmake
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/include/hpdf_config.h.cmake
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/include/hpdf_config.h.cmake
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libharu/include/hpdf.h
- ${EP_BASE}/Source/build_libharu/include/hpdf.h
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/include/hpdf.h
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/include/hpdf.h
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libharu/include/CMakeLists.txt
- ${EP_BASE}/Source/build_libharu/include/CMakeLists.txt
- COMMAND ${PATCH_EXECUTABLE} -d ${EP_BASE}/Source/build_libharu -p1 < ${CMAKE_SOURCE_DIR}/libharu/include_hpdf_config.h.patch
- COMMENT "Updating of libharu build system"
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/include/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/include/CMakeLists.txt
+ COMMAND ${PATCH_EXECUTABLE} -d ${EP_BASE}/Source/build_${BP_PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/include_hpdf_config.h.patch
+ COMMENT "Updating of ${BP_PACKAGE} build system"
DEPENDS
- ${CMAKE_SOURCE_DIR}/libharu/CMakeLists.txt
- ${CMAKE_SOURCE_DIR}/libharu/demo/CMakeLists.txt
- ${CMAKE_SOURCE_DIR}/libharu/src/hpdf_page_operator.c
- ${CMAKE_SOURCE_DIR}/libharu/src/CMakeLists.txt
- ${CMAKE_SOURCE_DIR}/libharu/cmake/modules/haru.cmake
- ${CMAKE_SOURCE_DIR}/libharu/cmake/modules/summary.cmake
- ${CMAKE_SOURCE_DIR}/libharu/include/hpdf_consts.h
- ${CMAKE_SOURCE_DIR}/libharu/include/hpdf_config.h.cmake
- ${CMAKE_SOURCE_DIR}/libharu/include/hpdf.h
- ${CMAKE_SOURCE_DIR}/libharu/include/CMakeLists.txt
- ${CMAKE_SOURCE_DIR}/libharu/include_hpdf_config.h.patch
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/demo/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/src/hpdf_page_operator.c
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/src/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/cmake/modules/haru.cmake
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/cmake/modules/summary.cmake
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/include/hpdf_consts.h
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/include/hpdf_config.h.cmake
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/include/hpdf.h
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/include/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/include_hpdf_config.h.patch
)
-ExternalProject_Add_Step(build_libharu update_build_system
- COMMENT "Updated libharu build system"
+ExternalProject_Add_Step(build_${BP_PACKAGE} update_build_system
+ COMMENT "Updated ${BP_PACKAGE} build system"
DEPENDEES download
DEPENDERS configure
DEPENDS
- ${EP_BASE}/Source/build_libharu/CMakeLists.txt
- ${EP_BASE}/Source/build_libharu/demo/CMakeLists.txt
- ${EP_BASE}/Source/build_libharu/src/hpdf_page_operator.c
- ${EP_BASE}/Source/build_libharu/src/CMakeLists.txt
- ${EP_BASE}/Source/build_libharu/cmake/modules/haru.cmake
- ${EP_BASE}/Source/build_libharu/cmake/modules/summary.cmake
- ${EP_BASE}/Source/build_libharu/include/hpdf_consts.h
- ${EP_BASE}/Source/build_libharu/include/hpdf_config.h.cmake
- ${EP_BASE}/Source/build_libharu/include/hpdf.h
- ${EP_BASE}/Source/build_libharu/include/CMakeLists.txt
- ${EP_BASE}/Source/build_libharu/src/hpdf_streams.c
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/demo/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/hpdf_page_operator.c
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/cmake/modules/haru.cmake
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/cmake/modules/summary.cmake
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/include/hpdf_consts.h
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/include/hpdf_config.h.cmake
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/include/hpdf.h
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/include/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/hpdf_streams.c
ALWAYS OFF
)
# Restore BP_PATH to original state.
set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
-#message(STATUS "shapelib restored original BP_PATH = ${BP_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")
Modified: trunk/cmake/build_projects/libqhull/ep.cmake
===================================================================
--- trunk/cmake/build_projects/libqhull/ep.cmake 2013-06-07 16:03:35 UTC (rev 12374)
+++ trunk/cmake/build_projects/libqhull/ep.cmake 2013-06-07 18:46:54 UTC (rev 12375)
@@ -1,6 +1,6 @@
# libqhull/ep.cmake
# This file should be included directly or indirectly from a top-level
-# CMakeLists.txt file to configure the build and test of libqhull.
+# CMakeLists.txt file to configure the build of libqhull.
# Copyright (C) 2013 Alan W. Irwin
@@ -24,23 +24,25 @@
# used below that configure how the External_Project functions
# operate.
+set(BP_PACKAGE libqhull)
+
# Data that is related to downloads.
-set(libqhull_URL http://www.qhull.org/download/qhull-2010.1-src.tgz)
-set(libqhull_URL_MD5 e64138470acdeb18f752a0bc2a11ceb4)
+set(${BP_PACKAGE}_URL http://www.qhull.org/download/qhull-2010.1-src.tgz)
+set(${BP_PACKAGE}_URL_MD5 e64138470acdeb18f752a0bc2a11ceb4)
# 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_libqhull/dll;${BP_PATH_NODLL}")
+ #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
determine_msys_path(BP_PATH "${BP_PATH}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for libqhull = ${BP_PATH}")
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
ExternalProject_Add(
- build_libqhull
- URL ${libqhull_URL}
- URL_MD5 ${libqhull_URL_MD5}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} ${EP_BASE}/Source/build_libqhull
+ 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 ${BP_PARALLEL_BUILD_COMMAND}
INSTALL_COMMAND ${BP_PARALLEL_BUILD_COMMAND} install
STEP_TARGETS download update_build_system configure build install test
@@ -50,47 +52,47 @@
# rather than time stamps alone.
add_custom_command(
OUTPUT
- ${EP_BASE}/Source/build_libqhull/CMakeLists.txt
- ${EP_BASE}/Source/build_libqhull/src/CMakeLists.txt
- ${EP_BASE}/Source/build_libqhull/src/libqhull.h
- ${EP_BASE}/Source/build_libqhull/src/mem.h
- ${EP_BASE}/Source/build_libqhull/src/unix.c
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/${BP_PACKAGE}.h
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/mem.h
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/unix.c
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libqhull/CMakeLists.txt
- ${EP_BASE}/Source/build_libqhull/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libqhull/src/CMakeLists.txt
- ${EP_BASE}/Source/build_libqhull/src/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/src/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libqhull/src/libqhull.h
- ${EP_BASE}/Source/build_libqhull/src/libqhull.h
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/src/${BP_PACKAGE}.h
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/${BP_PACKAGE}.h
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libqhull/src/mem.h
- ${EP_BASE}/Source/build_libqhull/src/mem.h
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/src/mem.h
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/mem.h
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/libqhull/src/unix.c
- ${EP_BASE}/Source/build_libqhull/src/unix.c
- COMMENT "Updating of libqhull build system"
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/src/unix.c
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/unix.c
+ COMMENT "Updating of ${BP_PACKAGE} build system"
DEPENDS
- ${CMAKE_SOURCE_DIR}/libqhull/CMakeLists.txt
- ${CMAKE_SOURCE_DIR}/libqhull/src/CMakeLists.txt
- ${CMAKE_SOURCE_DIR}/libqhull/src/libqhull.h
- ${CMAKE_SOURCE_DIR}/libqhull/src/mem.h
- ${CMAKE_SOURCE_DIR}/libqhull/src/unix.c
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/src/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/src/${BP_PACKAGE}.h
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/src/mem.h
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/src/unix.c
)
-ExternalProject_Add_Step(build_libqhull update_build_system
- COMMENT "Updated libqhull build system"
+ExternalProject_Add_Step(build_${BP_PACKAGE} update_build_system
+ COMMENT "Updated ${BP_PACKAGE} build system"
DEPENDEES download
DEPENDERS configure
DEPENDS
- ${EP_BASE}/Source/build_libqhull/CMakeLists.txt
- ${EP_BASE}/Source/build_libqhull/src/CMakeLists.txt
- ${EP_BASE}/Source/build_libqhull/src/libqhull.h
- ${EP_BASE}/Source/build_libqhull/src/mem.h
- ${EP_BASE}/Source/build_libqhull/src/unix.c
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/${BP_PACKAGE}.h
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/mem.h
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/src/unix.c
ALWAYS OFF
)
# Restore BP_PATH to original state.
set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
-#message(STATUS "shapelib restored original BP_PATH = ${BP_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")
Modified: trunk/cmake/build_projects/ndiff/ep.cmake
===================================================================
--- trunk/cmake/build_projects/ndiff/ep.cmake 2013-06-07 16:03:35 UTC (rev 12374)
+++ trunk/cmake/build_projects/ndiff/ep.cmake 2013-06-07 18:46:54 UTC (rev 12375)
@@ -1,6 +1,6 @@
# ndiff/ep.cmake
# This file should be included directly or indirectly from a top-level
-# CMakeLists.txt file to configure the build and test of ndiff.
+# CMakeLists.txt file to configure the build of ndiff.
# Copyright (C) 2013 Alan W. Irwin
@@ -24,27 +24,29 @@
# used below that configure how the External_Project functions
# operate.
+set(BP_PACKAGE ndiff)
+
# Data that is related to downloads.
-set(ndiff_URL ftp://ftp.math.utah.edu/pub/misc/ndiff-2.00.tar.gz)
+set(${BP_PACKAGE}_URL ftp://ftp.math.utah.edu/pub/misc/${BP_PACKAGE}-2.00.tar.gz)
# The MD5 value below is correct for the gpg --verified version
# Use URL_MD5 because ExternalProject_Add doesn't deal with gpg --version.
# In any case, gpg is not available for the MSYS_PLATFORM case.
-set(ndiff_URL_MD5 885548b4dc26e72c5455bebb5ba6c16d)
+set(${BP_PACKAGE}_URL_MD5 885548b4dc26e72c5455bebb5ba6c16d)
# 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_ndiff/dll;${BP_PATH_NODLL}")
+ #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
determine_msys_path(BP_PATH "${BP_PATH}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for ndiff = ${BP_PATH}")
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
ExternalProject_Add(
- build_ndiff
- URL ${ndiff_URL}
- URL_MD5 ${ndiff_URL_MD5}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} ${EP_BASE}/Source/build_ndiff
+ 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 ${BP_PARALLEL_BUILD_COMMAND}
TEST_BEFORE_INSTALL ON
TEST_COMMAND ${BP_PARALLEL_CTEST_COMMAND}
@@ -56,29 +58,29 @@
# rather than time stamps alone.
add_custom_command(
OUTPUT
- ${EP_BASE}/Source/build_ndiff/CMakeLists.txt
- ${EP_BASE}/Source/build_ndiff/config.h.cmake
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/config.h.cmake
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/ndiff/CMakeLists.txt
- ${EP_BASE}/Source/build_ndiff/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/ndiff/config.h.cmake
- ${EP_BASE}/Source/build_ndiff/config.h.cmake
- COMMENT "Updating of ndiff build system"
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/config.h.cmake
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/config.h.cmake
+ COMMENT "Updating of ${BP_PACKAGE} build system"
DEPENDS
- ${CMAKE_SOURCE_DIR}/ndiff/CMakeLists.txt
- ${CMAKE_SOURCE_DIR}/ndiff/config.h.cmake
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/config.h.cmake
)
-ExternalProject_Add_Step(build_ndiff update_build_system
- COMMENT "Updated ndiff build system"
+ExternalProject_Add_Step(build_${BP_PACKAGE} update_build_system
+ COMMENT "Updated ${BP_PACKAGE} build system"
DEPENDEES download
DEPENDERS configure
DEPENDS
- ${EP_BASE}/Source/build_ndiff/CMakeLists.txt
- ${EP_BASE}/Source/build_ndiff/config.h.cmake
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/config.h.cmake
ALWAYS OFF
)
# Restore BP_PATH to original state.
set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
-#message(STATUS "shapelib restored original BP_PATH = ${BP_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")
Modified: trunk/cmake/build_projects/shapelib/ep.cmake
===================================================================
--- trunk/cmake/build_projects/shapelib/ep.cmake 2013-06-07 16:03:35 UTC (rev 12374)
+++ trunk/cmake/build_projects/shapelib/ep.cmake 2013-06-07 18:46:54 UTC (rev 12375)
@@ -1,6 +1,6 @@
# shapelib/ep.cmake
# This file should be included directly or indirectly from a top-level
-# CMakeLists.txt file to configure the build and test of shapelib.
+# CMakeLists.txt file to configure the build of shapelib.
# Copyright (C) 2013 Alan W. Irwin
@@ -24,26 +24,28 @@
# used below that configure how the External_Project functions
# operate.
+set(BP_PACKAGE shapelib)
+
# Data that is related to downloads.
-set(shapelib_URL http://download.osgeo.org/shapelib/shapelib-1.3.0.tar.gz)
-set(shapelib_URL_MD5 2ff7d0b21d4b7506b452524492795f77)
+set(${BP_PACKAGE}_URL http://download.osgeo.org/${BP_PACKAGE}/${BP_PACKAGE}-1.3.0.tar.gz)
+set(${BP_PACKAGE}_URL_MD5 2ff7d0b21d4b7506b452524492795f77)
-set(shape_eg_data_URL http://dl.maptools.org/dl/shapelib/shape_eg_data.zip)
+set(shape_eg_data_URL http://dl.maptools.org/dl/${BP_PACKAGE}/shape_eg_data.zip)
set(shape_eg_data_URL_MD5 36208abd5d34c5c80101d8b214109f0d)
# 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_shapelib/dll;${BP_PATH_NODLL}")
+ set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
determine_msys_path(BP_PATH "${BP_PATH}")
endif(MSYS_PLATFORM)
-#message(STATUS "modified BP_PATH for shapelib = ${BP_PATH}")
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
ExternalProject_Add(
- build_shapelib
- URL ${shapelib_URL}
- URL_MD5 ${shapelib_URL_MD5}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DEG_DATA:PATH=${EP_BASE}/Source/build_shapelib/eg_data ${EP_BASE}/Source/build_shapelib
+ build_${BP_PACKAGE}
+ URL ${${BP_PACKAGE}_URL}
+ URL_MD5 ${${BP_PACKAGE}_URL_MD5}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DEG_DATA:PATH=${EP_BASE}/Source/build_${BP_PACKAGE}/eg_data ${EP_BASE}/Source/build_${BP_PACKAGE}
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
TEST_BEFORE_INSTALL ON
TEST_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_CTEST_COMMAND}
@@ -55,40 +57,40 @@
# generate real file dependencies rather than time stamps alone.
add_custom_command(
OUTPUT
- ${EP_BASE}/Source/build_shapelib/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/shapelib/CMakeLists.txt
- ${EP_BASE}/Source/build_shapelib/CMakeLists.txt
- COMMENT "Updating of shapelib build system"
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
+ COMMENT "Updating of ${BP_PACKAGE} build system"
DEPENDS
- ${CMAKE_SOURCE_DIR}/shapelib/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
)
-ExternalProject_Add_Step(build_shapelib update_build_system
- COMMENT "Updated shapelib build system"
+ExternalProject_Add_Step(build_${BP_PACKAGE} update_build_system
+ COMMENT "Updated ${BP_PACKAGE} build system"
DEPENDEES download
DEPENDERS configure
DEPENDS
- ${EP_BASE}/Source/build_shapelib/CMakeLists.txt
+ ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
ALWAYS OFF
)
add_custom_command(
OUTPUT
- ${EP_BASE}/Download/build_shapelib/shape_eg_data.zip
- COMMAND ${CMAKE_COMMAND} -DURL:STRING=${shape_eg_data_URL} -DFILE:FILEPATH=${EP_BASE}/Download/build_shapelib/shape_eg_data.zip -DMD5:STRING=${shape_eg_data_URL_MD5} -P ${CMAKE_SOURCE_DIR}/download_check.cmake
- COMMAND ${CMAKE_COMMAND} -E remove_directory ${EP_BASE}/Source/build_shapelib/eg_data
- COMMAND ${UNZIP_EXECUTABLE} -q ${EP_BASE}/Download/build_shapelib/shape_eg_data.zip -d ${EP_BASE}/Source/build_shapelib/eg_data
- COMMENT "getting eg_data for shapelib test"
+ ${EP_BASE}/Download/build_${BP_PACKAGE}/shape_eg_data.zip
+ COMMAND ${CMAKE_COMMAND} -DURL:STRING=${shape_eg_data_URL} -DFILE:FILEPATH=${EP_BASE}/Download/build_${BP_PACKAGE}/shape_eg_data.zip -DMD5:STRING=${shape_eg_data_URL_MD5} -P ${CMAKE_SOURCE_DIR}/download_check.cmake
+ COMMAND ${CMAKE_COMMAND} -E remove_directory ${EP_BASE}/Source/build_${BP_PACKAGE}/eg_data
+ COMMAND ${UNZIP_EXECUTABLE} -q ${EP_BASE}/Download/build_${BP_PACKAGE}/shape_eg_data.zip -d ${EP_BASE}/Source/build_${BP_PACKAGE}/eg_data
+ COMMENT "getting eg_data for ${BP_PACKAGE} test"
)
-ExternalProject_Add_Step(build_shapelib get_eg_data
- COMMENT "got eg_data for shapelib test"
+ExternalProject_Add_Step(build_${BP_PACKAGE} get_eg_data
+ COMMENT "got eg_data for ${BP_PACKAGE} test"
DEPENDEES download
DEPENDERS configure
DEPENDS
- ${EP_BASE}/Download/build_shapelib/shape_eg_data.zip
+ ${EP_BASE}/Download/build_${BP_PACKAGE}/shape_eg_data.zip
ALWAYS OFF
)
# Restore BP_PATH to original state.
set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
-#message(STATUS "shapelib restored original BP_PATH = ${BP_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
