diff -Naur scidavis.1.D8/config.pri scidavis.1.D8.new/config.pri
--- scidavis.1.D8/config.pri 2014-07-23 07:01:09.000000000 +0200
+++ scidavis.1.D8.new/config.pri 2014-08-04 12:22:31.042440454 +0200
@@ -197,10 +197,10 @@
################################################################################
# code for maintained branch of liborigin.
-contains(DEFINES, ORIGIN_IMPORT) {
- LIBS += ../3rdparty/liborigin/liborigin.a
- INCLUDEPATH += ../3rdparty/liborigin
- }
+#contains(DEFINES, ORIGIN_IMPORT) {
+# LIBS += ../3rdparty/liborigin/liborigin.a
+# INCLUDEPATH += ../3rdparty/liborigin
+# }
contains(PRESET, default_installation) {
### Link statically against Qwt and Qwtplot3D (in order to make sure they
@@ -270,10 +270,10 @@
LIBS += -lgsl -lgslcblas
LIBS += -lmuparser
-# contains(DEFINES, ORIGIN_IMPORT) {
-# LIBS += -L../3rdparty/liborigin -lorigin
-# INCLUDEPATH += ../3rdparty/liborigin
-# }
+ contains(DEFINES, ORIGIN_IMPORT) {
+ LIBS += -lorigin2
+ INCLUDEPATH += /usr/include/liborigin2
+ }
}
contains(PRESET, self_contained) {
diff -Naur scidavis.1.D8/scidavis.pro scidavis.1.D8.new/scidavis.pro
--- scidavis.1.D8/scidavis.pro 2014-07-23 07:01:09.000000000 +0200
+++ scidavis.1.D8.new/scidavis.pro 2014-08-04 12:23:22.598178304 +0200
@@ -7,12 +7,9 @@
#################################################
TEMPLATE = subdirs
-SUBDIRS = 3rdparty/liborigin scidavis test
+SUBDIRS = scidavis test
CONFIG+=ordered
-# Overwrite the qmake generated Makefile by the cmake one
-system("cd 3rdparty/liborigin; rm CMakeCache.txt; cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_FLAGS:STRING=-DNO_CODE_GENERATION_FOR_LOG .")
-
!mxe {
# optional fit plugins
SUBDIRS += fitPlugins/fitRational0\