[gmt] 01/02: Add fix for cmake version 3.0

Johan Van de Wauw johanvdw-guest at moszumanska.debian.org
Thu Jul 9 18:35:25 UTC 2015


This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch ubuntu
in repository gmt.

commit 549a287d58173fdfe09f2276dd8523f21cdb4751
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Thu Jul 9 18:48:25 2015 +0200

    Add fix for cmake version 3.0
---
 debian/patches/cmake30.patch | 129 +++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |   1 +
 2 files changed, 130 insertions(+)

diff --git a/debian/patches/cmake30.patch b/debian/patches/cmake30.patch
new file mode 100644
index 0000000..9d1b3d1
--- /dev/null
+++ b/debian/patches/cmake30.patch
@@ -0,0 +1,129 @@
+--- a/doc/examples/CMakeLists.txt
++++ b/doc/examples/CMakeLists.txt
+@@ -32,67 +32,66 @@ foreach (_ps ${_examples})
+ 	# Skip excluded examples
+ 	list (FIND _exclude_examples ${_fig} _exclude_index)
+ 	if (_exclude_index GREATER -1)
+-		continue()
++	elseif (_exclude_index GREATER -1)
++  	string (REPLACE ".ps" ".pdf" _pdf_fig ${_fig})
++  	string (REPLACE ".ps" ".png" _png_fig ${_fig})
++  	list (APPEND _examples_pdf ${RST_BINARY_DIR}/_images/${_pdf_fig})
++  	list (APPEND _examples_png ${RST_BINARY_DIR}/_images/${_png_fig})
++  
++  	if (WIN32)
++  		add_custom_command (OUTPUT ${RST_BINARY_DIR}/_images/${_pdf_fig}
++  			COMMAND
++  			_dummy_var=cmake_assumes_this_is_a_command # needed for spaces to be escaped correctly
++  			set GMT_USERDIR=${GMT_BINARY_DIR}/share
++  			COMMAND
++  			set GMT_SHAREDIR=${GMT_SOURCE_DIR}/share
++  			COMMAND
++  			${GMT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/src/gmt ps2raster -A+S0.6 -P -Tf
++  			-C-sFONTPATH="${GMT_SOURCE_DIR}/doc/examples/ex31/fonts"
++  			-D${RST_BINARY_DIR}/_images
++  			${CMAKE_CURRENT_SOURCE_DIR}/${_ps}
++  			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++  			DEPENDS gmt_for_img_convert ${CMAKE_CURRENT_SOURCE_DIR}/${_ps})
++  		add_custom_command (OUTPUT ${RST_BINARY_DIR}/_images/${_png_fig}
++  			COMMAND
++  			_dummy_var=cmake_assumes_this_is_a_command # needed for spaces to be escaped correctly
++  			set GMT_USERDIR=${GMT_BINARY_DIR}/share
++  			COMMAND
++  			set GMT_SHAREDIR=${GMT_SOURCE_DIR}/share
++  			COMMAND
++  			${GMT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/src/gmt ps2raster
++  			-A -P -E150 -TG -Qg4 -Qt4 -C-dDOINTERPOLATE
++  			-C-sFONTPATH="${GMT_SOURCE_DIR}/doc/examples/ex31/fonts"
++  			-D${RST_BINARY_DIR}/_images
++  			${CMAKE_CURRENT_SOURCE_DIR}/${_ps}
++  			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++  			DEPENDS gmt_for_img_convert ${CMAKE_CURRENT_SOURCE_DIR}/${_ps})
++  	else (WIN32)
++  		add_custom_command (OUTPUT ${RST_BINARY_DIR}/_images/${_pdf_fig}
++  			COMMAND
++  			_dummy_var=cmake_assumes_this_is_a_command # needed for spaces to be escaped correctly
++  			GMT_USERDIR=${GMT_BINARY_DIR}/share
++  			GMT_SHAREDIR=${GMT_SOURCE_DIR}/share
++  			${GMT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/src/gmt ps2raster -A+S0.6 -P -Tf
++  			-C-sFONTPATH="${GMT_SOURCE_DIR}/doc/examples/ex31/fonts"
++  			-D${RST_BINARY_DIR}/_images
++  			${CMAKE_CURRENT_SOURCE_DIR}/${_ps}
++  			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++  			DEPENDS gmt_for_img_convert ${CMAKE_CURRENT_SOURCE_DIR}/${_ps})
++  		add_custom_command (OUTPUT ${RST_BINARY_DIR}/_images/${_png_fig}
++  			COMMAND
++  			_dummy_var=cmake_assumes_this_is_a_command # needed for spaces to be escaped correctly
++  			GMT_USERDIR=${GMT_BINARY_DIR}/share
++  			GMT_SHAREDIR=${GMT_SOURCE_DIR}/share
++  			${GMT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/src/gmt ps2raster
++  			-A -P -E150 -TG -Qg4 -Qt4 -C-dDOINTERPOLATE
++  			-C-sFONTPATH="${GMT_SOURCE_DIR}/doc/examples/ex31/fonts"
++  			-D${RST_BINARY_DIR}/_images
++  			${CMAKE_CURRENT_SOURCE_DIR}/${_ps}
++  			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++  			DEPENDS gmt_for_img_convert ${CMAKE_CURRENT_SOURCE_DIR}/${_ps})
++  	endif (WIN32)
+ 	endif (_exclude_index GREATER -1)
+-
+-	string (REPLACE ".ps" ".pdf" _pdf_fig ${_fig})
+-	string (REPLACE ".ps" ".png" _png_fig ${_fig})
+-	list (APPEND _examples_pdf ${RST_BINARY_DIR}/_images/${_pdf_fig})
+-	list (APPEND _examples_png ${RST_BINARY_DIR}/_images/${_png_fig})
+-
+-	if (WIN32)
+-		add_custom_command (OUTPUT ${RST_BINARY_DIR}/_images/${_pdf_fig}
+-			COMMAND
+-			_dummy_var=cmake_assumes_this_is_a_command # needed for spaces to be escaped correctly
+-			set GMT_USERDIR=${GMT_BINARY_DIR}/share
+-			COMMAND
+-			set GMT_SHAREDIR=${GMT_SOURCE_DIR}/share
+-			COMMAND
+-			${GMT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/src/gmt ps2raster -A+S0.6 -P -Tf
+-			-C-sFONTPATH="${GMT_SOURCE_DIR}/doc/examples/ex31/fonts"
+-			-D${RST_BINARY_DIR}/_images
+-			${CMAKE_CURRENT_SOURCE_DIR}/${_ps}
+-			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-			DEPENDS gmt_for_img_convert ${CMAKE_CURRENT_SOURCE_DIR}/${_ps})
+-		add_custom_command (OUTPUT ${RST_BINARY_DIR}/_images/${_png_fig}
+-			COMMAND
+-			_dummy_var=cmake_assumes_this_is_a_command # needed for spaces to be escaped correctly
+-			set GMT_USERDIR=${GMT_BINARY_DIR}/share
+-			COMMAND
+-			set GMT_SHAREDIR=${GMT_SOURCE_DIR}/share
+-			COMMAND
+-			${GMT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/src/gmt ps2raster
+-			-A -P -E150 -TG -Qg4 -Qt4 -C-dDOINTERPOLATE
+-			-C-sFONTPATH="${GMT_SOURCE_DIR}/doc/examples/ex31/fonts"
+-			-D${RST_BINARY_DIR}/_images
+-			${CMAKE_CURRENT_SOURCE_DIR}/${_ps}
+-			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-			DEPENDS gmt_for_img_convert ${CMAKE_CURRENT_SOURCE_DIR}/${_ps})
+-	else (WIN32)
+-		add_custom_command (OUTPUT ${RST_BINARY_DIR}/_images/${_pdf_fig}
+-			COMMAND
+-			_dummy_var=cmake_assumes_this_is_a_command # needed for spaces to be escaped correctly
+-			GMT_USERDIR=${GMT_BINARY_DIR}/share
+-			GMT_SHAREDIR=${GMT_SOURCE_DIR}/share
+-			${GMT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/src/gmt ps2raster -A+S0.6 -P -Tf
+-			-C-sFONTPATH="${GMT_SOURCE_DIR}/doc/examples/ex31/fonts"
+-			-D${RST_BINARY_DIR}/_images
+-			${CMAKE_CURRENT_SOURCE_DIR}/${_ps}
+-			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-			DEPENDS gmt_for_img_convert ${CMAKE_CURRENT_SOURCE_DIR}/${_ps})
+-		add_custom_command (OUTPUT ${RST_BINARY_DIR}/_images/${_png_fig}
+-			COMMAND
+-			_dummy_var=cmake_assumes_this_is_a_command # needed for spaces to be escaped correctly
+-			GMT_USERDIR=${GMT_BINARY_DIR}/share
+-			GMT_SHAREDIR=${GMT_SOURCE_DIR}/share
+-			${GMT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/src/gmt ps2raster
+-			-A -P -E150 -TG -Qg4 -Qt4 -C-dDOINTERPOLATE
+-			-C-sFONTPATH="${GMT_SOURCE_DIR}/doc/examples/ex31/fonts"
+-			-D${RST_BINARY_DIR}/_images
+-			${CMAKE_CURRENT_SOURCE_DIR}/${_ps}
+-			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-			DEPENDS gmt_for_img_convert ${CMAKE_CURRENT_SOURCE_DIR}/${_ps})
+-	endif (WIN32)
+ endforeach (_ps ${_examples})
+ 
+ # List of job scripts and convert to verbatim
diff --git a/debian/patches/series b/debian/patches/series
index 73d1746..212b7c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ length-typo.patch
 palette-typo.patch
 kfreebsd.patch
 mips.patch
+cmake30.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gmt.git



More information about the Pkg-grass-devel mailing list