From 630321df21a93ca31a6dbdfef88a27df9fc6b586 Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Thu, 4 Sep 2014 22:57:33 +0300 Subject: [PATCH] Install mathgl.oct in libmgl-data package --- debian/patches/lang.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + lang/CMakeLists.txt | 12 +++++++----- 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 debian/patches/lang.patch diff --git a/debian/patches/lang.patch b/debian/patches/lang.patch new file mode 100644 index 0000000..960df3e --- /dev/null +++ b/debian/patches/lang.patch @@ -0,0 +1,21 @@ +--- a/lang/CMakeLists.txt ++++ b/lang/CMakeLists.txt +@@ -123,11 +123,13 @@ + add_custom_target(mgl_octave_module ALL DEPENDS mathgl.tar.gz) + + install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.tar.gz DESTINATION ${MGL_DATA_PATH}) +- if(enable-octave-install) +- install(CODE "execute_process( +- COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\" +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )") +- endif(enable-octave-install) ++ install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.oct DESTINATION ${MGL_DATA_PATH}) ++# if(enable-octave-install) ++# install(CODE "execute_process( ++# COMMAND ${oct_exec} -q --eval \"pkg prefix ${MathGL_SOURCE_DIR}/debian/tmp/usr/share/mathgl\" ++# COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\" ++# WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )") ++# endif(enable-octave-install) + set(mgl_clean_files ${mgl_clean_files} mathgl) + endif(enable-octave) + set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${mgl_clean_files}") diff --git a/debian/patches/series b/debian/patches/series index e20e679..3a8f9d7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +lang.patch widgets.patch CMakeLists.patch diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index 68ec117..1426155 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -123,11 +123,13 @@ message(STATUS "${oct_prog} ${oct_host} ${oct_api}") add_custom_target(mgl_octave_module ALL DEPENDS mathgl.tar.gz) install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.tar.gz DESTINATION ${MGL_DATA_PATH}) - if(enable-octave-install) - install(CODE "execute_process( - COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\" - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )") - endif(enable-octave-install) + install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.oct DESTINATION ${MGL_DATA_PATH}) +# if(enable-octave-install) +# install(CODE "execute_process( +# COMMAND ${oct_exec} -q --eval \"pkg prefix ${MathGL_SOURCE_DIR}/debian/tmp/usr/share/mathgl\" +# COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\" +# WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )") +# endif(enable-octave-install) set(mgl_clean_files ${mgl_clean_files} mathgl) endif(enable-octave) set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${mgl_clean_files}") -- 2.30.2