[Pkg-octave-devel] Debian patches for out-of-source builds of 0.8.2
Hi,
attached are the patches we currently use in Debian for 0.8.2. This
enables an out-of-source build for us and should fix some of the
problems reported in
http://qtoctave.wordpress.com/2009/07/04/qtoctave-0-8-2-released/#comments
Thanks
Thomas
Enable out-of-source builds for CMake, by addinge some include paths
to the cmake include directories.
-- Thomas Weber <thomas.weber.mail@gmail.com> Tue, 22 Apr 2008 09:03:38 +0200
--- a/easy_plot/src/CMakeLists.txt
+++ b/easy_plot/src/CMakeLists.txt
@@ -7,6 +7,7 @@
include(UseQt4)
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
include_directories(${QT_INCLUDE_DIR})
include_directories(${QT_QT_INCLUDE_DIR})
include_directories(${QT_QTCORE_INCLUDE_DIR})
@@ -45,4 +46,4 @@
TARGETS easy_plot
RUNTIME
DESTINATION bin
- )
\ No newline at end of file
+ )
--- a/qtoctave/src/CMakeLists.txt
+++ b/qtoctave/src/CMakeLists.txt
@@ -6,6 +6,8 @@
include(UseQt4)
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/projects )
include_directories(${QT_INCLUDE_DIR})
include_directories(${QT_QT_INCLUDE_DIR})
include_directories(${QT_QTCORE_INCLUDE_DIR})
--- a/qtoctave/src/configure.h
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#ifndef __CONFIGURE_H__
-#define __CONFIGURE_H__
-#define CONFIG_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave"
-#define HELP_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/octave_doc/index.html"
-#define ICON_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/images"
-#define LANG_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/lang"
-#define QTOCTAVE_HELP_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/qtoctave_doc/index.html"
-
-#define PKG_CMD_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/pkg-commands.list"
-#endif
Use a different signature of the INSTALL command, so installation works also
for an out-out-source build
--- a/easy_plot/src/CMakeLists.txt
+++ b/easy_plot/src/CMakeLists.txt
@@ -42,6 +42,7 @@
TARGET_LINK_LIBRARIES(easy_plot ${Qt4_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTSVG_LIBRARY})
install (
- PROGRAMS easy_plot
+ TARGETS easy_plot
+ RUNTIME
DESTINATION bin
)
\ No newline at end of file
Reply to: