summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Undheim <ruben.undheim@gmail.com>2018-07-29 19:13:30 +0000
committerRuben Undheim <ruben.undheim@gmail.com>2018-07-29 19:14:06 +0000
commit070825fc8628d6138427ae32282968d32c6effd0 (patch)
tree37d6664e6d68af457941bc66b48b093c66d74487
parent95bb712501403dd25ea0eea4f985059ba57a0bbf (diff)
More changes because of removal of fparser
-rw-r--r--debian/libfparser-dev.install2
-rw-r--r--debian/libfparser4.install1
-rw-r--r--debian/libfparser4.shlibs1
-rwxr-xr-xdebian/rules8
4 files changed, 4 insertions, 8 deletions
diff --git a/debian/libfparser-dev.install b/debian/libfparser-dev.install
deleted file mode 100644
index aebac87..0000000
--- a/debian/libfparser-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libfp*.so
-usr/include/fparser*
diff --git a/debian/libfparser4.install b/debian/libfparser4.install
deleted file mode 100644
index 4534ce6..0000000
--- a/debian/libfparser4.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libfparser.so.*
diff --git a/debian/libfparser4.shlibs b/debian/libfparser4.shlibs
deleted file mode 100644
index 8e5cadb..0000000
--- a/debian/libfparser4.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libfparser 4 libfparser4
diff --git a/debian/rules b/debian/rules
index ba6c9fe..df6c3e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,12 +30,12 @@ override_dh_auto_configure:
override_dh_auto_build:
override_dh_auto_install:
- cd CSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DFPARSER_ROOT_DIR=../../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .. && make && make install DESTDIR=../../debian/tmp
- cd QCSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DFPARSER_ROOT_DIR=../../debian/tmp/usr -DCSXCAD_ROOT_DIR=../../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .. && make && make install DESTDIR=../../debian/tmp
- cd openEMS && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DFPARSER_ROOT_DIR=../../debian/tmp/usr -DCSXCAD_ROOT_DIR=../../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) ..
+ cd CSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .. && make && make install DESTDIR=../../debian/tmp
+ cd QCSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DCSXCAD_ROOT_DIR=../../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .. && make && make install DESTDIR=../../debian/tmp
+ cd openEMS && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DCSXCAD_ROOT_DIR=../../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) ..
cd openEMS/build && make
cd openEMS/build && make install DESTDIR=../../debian/tmp
- cd AppCSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DFPARSER_ROOT_DIR=../../debian/tmp/usr -DCSXCAD_ROOT_DIR=../../debian/tmp/usr -DQCSXCAD_ROOT_DIR=../../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) ..
+ cd AppCSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DCSXCAD_ROOT_DIR=../../debian/tmp/usr -DQCSXCAD_ROOT_DIR=../../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) ..
cd AppCSXCAD/build && make
cd AppCSXCAD/build && make install DESTDIR=../../debian/tmp
cd debian/tmp/usr/share/openEMS/matlab && CXXFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" mkoctfile -lhdf5_cpp -DH5_USE_16_API -I/usr/include/hdf5/serial h5readatt_octave.cc