[Plplot-cvs] SF.net SVN: plplot:[12818] trunk/cmake/epa_build

[<ai...@us...>]

Revision: 12818
          http://sourceforge.net/p/plplot/code/12818
Author:   airwin
Date:     2013-12-06 00:12:13 +0000 (Fri, 06 Dec 2013)
Log Message:
-----------
Replace ${CMAKE_SOURCE_DIR}/${PACKAGE} by the equivalent (and slightly
more understandable) ${CMAKE_CURRENT_SOURCE_DIR}.

Tested by: Alan W. Irwin <ai...@us...> on Linux using
epa_build with BUILD_THE_BUILDTOOLS OFF (the default) and the
build_plplot target (which builds, tests, and installs all configured
PLplot primary, secondary, etc., dependencies (including pango/cairo
and wxwidgets) before building, testing, and installing PLplot itself
(with the test_noninteractive target used for the testing part of that
task). Running this build_plplot target took 0.5 hours and verifies at
least on Linux that the new add_subdirectory paradigm for the CMake
logic used for epa_build is working well.

Modified Paths:
--------------
    trunk/cmake/epa_build/docbook-xml/CMakeLists.txt
    trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt
    trunk/cmake/epa_build/itk/CMakeLists.txt
    trunk/cmake/epa_build/iwidgets/CMakeLists.txt
    trunk/cmake/epa_build/libagg/CMakeLists.txt
    trunk/cmake/epa_build/libqhull/CMakeLists.txt
    trunk/cmake/epa_build/ndiff/CMakeLists.txt
    trunk/cmake/epa_build/shapelib/CMakeLists.txt
    trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt

Modified: trunk/cmake/epa_build/docbook-xml/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/docbook-xml/CMakeLists.txt	2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/docbook-xml/CMakeLists.txt	2013-12-06 00:12:13 UTC (rev 12818)
@@ -59,10 +59,10 @@
   OUTPUT
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-update
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
   ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
   COMMENT "Custom updating of ${PACKAGE}"
   DEPENDS
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
   APPEND
   )

Modified: trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt	2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/docbook-xsl/CMakeLists.txt	2013-12-06 00:12:13 UTC (rev 12818)
@@ -58,10 +58,10 @@
   OUTPUT
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-update
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
   ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
   COMMENT "Custom updating of ${PACKAGE}"
   DEPENDS
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
   APPEND
   )

Modified: trunk/cmake/epa_build/itk/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/itk/CMakeLists.txt	2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/itk/CMakeLists.txt	2013-12-06 00:12:13 UTC (rev 12818)
@@ -73,11 +73,11 @@
   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=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${PACKAGE}/itk4_case.patch
+  COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/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=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${PACKAGE}/itk4_header_list.patch
+  COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/itk4_header_list.patch
   APPEND
   )
 

Modified: trunk/cmake/epa_build/iwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/iwidgets/CMakeLists.txt	2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/iwidgets/CMakeLists.txt	2013-12-06 00:12:13 UTC (rev 12818)
@@ -79,9 +79,9 @@
   OUTPUT
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
   COMMAND echo "Apply iwidgets4.1 source code patch"
-  COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}4.1.patch
+  COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}4.1.patch
   COMMAND echo "Apply patch to support both iwidgets and Iwidgets package names"
-  COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}4_case.patch
+  COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}4_case.patch
   APPEND
   )
 
@@ -90,7 +90,7 @@
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
   COMMAND echo "Add CMake-based build system"
   COMMAND ${CMAKE_COMMAND} -E copy_if_different 
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
   ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
   APPEND
   )

Modified: trunk/cmake/epa_build/libagg/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libagg/CMakeLists.txt	2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/libagg/CMakeLists.txt	2013-12-06 00:12:13 UTC (rev 12818)
@@ -65,10 +65,10 @@
   OUTPUT
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-update
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
   ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
   COMMENT "Custom updating of ${PACKAGE}"
   DEPENDS
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
   APPEND
   )

Modified: trunk/cmake/epa_build/libqhull/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/libqhull/CMakeLists.txt	2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/libqhull/CMakeLists.txt	2013-12-06 00:12:13 UTC (rev 12818)
@@ -57,26 +57,26 @@
   OUTPUT
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-update
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
   ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists.txt
   ${EPA_BASE}/Source/build_${PACKAGE}/src/CMakeLists.txt
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/${PACKAGE}.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/${PACKAGE}.h
   ${EPA_BASE}/Source/build_${PACKAGE}/src/${PACKAGE}.h
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/mem.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/mem.h
   ${EPA_BASE}/Source/build_${PACKAGE}/src/mem.h
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/unix.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/unix.c
   ${EPA_BASE}/Source/build_${PACKAGE}/src/unix.c
   COMMENT "Custom updating of ${PACKAGE}"
   DEPENDS
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/CMakeLists.txt
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/${PACKAGE}.h
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/mem.h
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/src/unix.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/${PACKAGE}.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/mem.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/unix.c
   APPEND
   )

Modified: trunk/cmake/epa_build/ndiff/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/ndiff/CMakeLists.txt	2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/ndiff/CMakeLists.txt	2013-12-06 00:12:13 UTC (rev 12818)
@@ -63,14 +63,14 @@
   OUTPUT
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-update
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
   ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/config.h.cmake
+  ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
   ${EPA_BASE}/Source/build_${PACKAGE}/config.h.cmake
   COMMENT "Custom updating of ${PACKAGE}"
   DEPENDS
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/config.h.cmake
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
   APPEND
   )

Modified: trunk/cmake/epa_build/shapelib/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/shapelib/CMakeLists.txt	2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/shapelib/CMakeLists.txt	2013-12-06 00:12:13 UTC (rev 12818)
@@ -76,14 +76,14 @@
   OUTPUT
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-update
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
   ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
   COMMAND ${CMAKE_COMMAND} -DURL:STRING=${shape_eg_data_URL} -DFILE:FILEPATH=${EPA_BASE}/Download/build_${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 ${EPA_BASE}/Source/build_${PACKAGE}/eg_data
   COMMAND ${UNZIP_EXECUTABLE} -q ${EPA_BASE}/Download/build_${PACKAGE}/shape_eg_data.zip -d ${EPA_BASE}/Source/build_${PACKAGE}/eg_data
   COMMENT "Custom updating of ${PACKAGE}"
   DEPENDS
-  ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt
   ${CMAKE_SOURCE_DIR}/download_check.cmake
   # N.B. no file dependencies are worthwhile for the eg_data
   # chain above since it all starts with a download.

Modified: trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt	2013-12-05 22:59:35 UTC (rev 12817)
+++ trunk/cmake/epa_build/xmlcatalog-wrapper/CMakeLists.txt	2013-12-06 00:12:13 UTC (rev 12818)
@@ -46,7 +46,7 @@
   build_${PACKAGE}
   DEPENDS ${dependencies_targets}
   # The entire source code is just one CMakeLists.txt file.
-  DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/${PACKAGE}/${PACKAGE}_CMakeLists.txt ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}_CMakeLists.txt ${EPA_BASE}/Source/build_${PACKAGE}/CMakeLists.txt
   CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_CMAKE_COMMAND} ${EP_BASE}/Source/build_${PACKAGE}
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
   BUILD_IN_SOURCE OFF

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.