|
From: <hp...@us...> - 2014-10-27 00:41:34
|
Revision: 1460
http://sourceforge.net/p/scidavis/svn/1460
Author: hpcoder
Date: 2014-10-27 00:41:29 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
liborigin support is optional now, by specifying qmake CONFIG+=liborigin
Modified Paths:
--------------
branches/development/config.pri
branches/development/scidavis.pro
Modified: branches/development/config.pri
===================================================================
--- branches/development/config.pri 2014-10-27 00:06:30 UTC (rev 1459)
+++ branches/development/config.pri 2014-10-27 00:41:29 UTC (rev 1460)
@@ -192,14 +192,19 @@
}
### support for Origin OPJ import using liborigin2
+mxe|osx_dist|aegis {
+CONFIG+=liborigin
+}
+liborigin {
DEFINES += ORIGIN_IMPORT
+}
################################################################################
### Dependencies #
################################################################################
# code for maintained branch of liborigin.
-contains(DEFINES, ORIGIN_IMPORT) {
+liborigin {
LIBS += ../3rdparty/liborigin/liborigin.a
INCLUDEPATH += ../3rdparty/liborigin
}
@@ -224,7 +229,7 @@
# }
}
-contains(PRESET, mac_dist) {
+osx_dist {
# Uses MacPorts supplied versions of the dependencies
INCLUDEPATH += /opt/local/include
@@ -239,11 +244,8 @@
LIBS += -lgsl -lgslcblas -lz
LIBS += -lmuparser -lpython2.7
-# contains(DEFINES, ORIGIN_IMPORT) {
-# LIBS += -L../3rdparty/liborigin2 -lorigin
-# INCLUDEPATH += ../3rdparty/liborigin2
-# }
-
+# this was an attempt to add a post build step. Doesn't seem to work,
+# so just run this step manually
QMAKE_EXTRA_TARGETS += mac-dist
mac-dist.commands = sh mkMacDist.sh
Modified: branches/development/scidavis.pro
===================================================================
--- branches/development/scidavis.pro 2014-10-27 00:06:30 UTC (rev 1459)
+++ branches/development/scidavis.pro 2014-10-27 00:41:29 UTC (rev 1460)
@@ -2,16 +2,26 @@
# SciDAVis main project file
# run "qmake scidavis.pro" to generate the Makefile
# In most cases you don't have to make changes to
-# this file but to the "scidavis.pro" file in the
-# "scidavis" subdirectory.
+# this file but to the "config.pri" file
#################################################
TEMPLATE = subdirs
-SUBDIRS = 3rdparty/liborigin scidavis test
+# configurations that automatically turn on liborigin - mainly the
+# binary releases, as well as the AEGIS build
+mxe|osx_dist|aegis {
+ CONFIG += liborigin
+}
+
+# liborigin must come first, if it exists
+liborigin {
+ SUBDIRS = 3rdparty/liborigin
+}
+SUBDIRS += scidavis test
CONFIG+=ordered
!mxe {
# optional fit plugins
+# mxe is a static build, so these are included elsewhere
SUBDIRS += fitPlugins/fitRational0\
fitPlugins/fitRational1\
fitPlugins/explin\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|