[bollin] r5486 committed - workaround octave include issue

1 view
Skip to first unread message

bol...@googlecode.com

unread,
Jul 9, 2014, 4:05:31 AM7/9/14
to debian...@googlegroups.com
Revision: 5486
Author: Soeren.Sonnenburg
Date: Wed Jul 9 08:05:20 2014 UTC
Log: workaround octave include issue
http://code.google.com/p/bollin/source/detail?r=5486

Modified:
/octave-shogun/trunk/debian/rules

=======================================
--- /octave-shogun/trunk/debian/rules Wed Jul 9 07:38:16 2014 UTC
+++ /octave-shogun/trunk/debian/rules Wed Jul 9 08:05:20 2014 UTC
@@ -9,10 +9,13 @@
CXX=/usr/bin/g++
endif

+OCTAVE_INCLUDE_DIR=$(shell octave-config -p OCTINCLUDEDIR)
+
ifeq ($(ARCH),$(filter $(ARCH),i386 hurd-i386 kfreebsd-i386))
DISABLE_SSE="-DDISABLE_SSE=ON"
endif

+
all:
echo ${CXX}

@@ -24,7 +27,8 @@
dh_auto_configure -- -DENABLE_CCACHE=FALSE -DCMAKE_SKIP_RPATH=TRUE \
-DBUILD_EXAMPLES=OFF -DUSE_SVMLIGHT=OFF -DOctaveStatic=ON
-DOctaveModular=ON \
-DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
-DSWIG_EXECUTABLE=/usr/bin/swig3.0 \
- $(DISABLE_SSE)
+ $(DISABLE_SSE) \
+ -DCMAKE_CXX_FLAGS="-I$(OCTAVE_INCLUDE_DIR)"
-DCMAKE_C_FLAGS="-I$(OCTAVE_INCLUDE_DIR)"

override_dh_install:
$(MAKE) -C doc examples
Reply all
Reply to author
Forward
0 new messages