Files
@ fe6571574827
Branch filter:
Location: EI/VirtualLeaf/src/VirtualLeaf.pro - annotation
fe6571574827
4.3 KiB
text/x-prolog
Merge Roeland's recent changes to correct some problems with software deployment on MacOSX.
--
user: Michael Guravage <michael.guravage@cwi.nl>
branch merge
branch 'default'
changed doc/mac-deploy-howto.txt
changed src/VirtualLeaf.pro
changed src/perl/deploymodel.pl
--
user: Michael Guravage <michael.guravage@cwi.nl>
branch merge
branch 'default'
changed doc/mac-deploy-howto.txt
changed src/VirtualLeaf.pro
changed src/perl/deploymodel.pl
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 | 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 5469f4c56a53 5469f4c56a53 41d0f8948f63 41d0f8948f63 41d0f8948f63 15d600891648 caa535c40937 caa535c40937 41d0f8948f63 b2521b04d47d 41d0f8948f63 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e ae58c51ca8dd 79f94eaa3b9e 79f94eaa3b9e 41d0f8948f63 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e b117ca5d846f ae58c51ca8dd ae58c51ca8dd ae58c51ca8dd 79f94eaa3b9e 79f94eaa3b9e ae58c51ca8dd 41d0f8948f63 41d0f8948f63 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 096de6bb6fab 096de6bb6fab 31e2c8add85c 79f94eaa3b9e 096de6bb6fab 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 15d600891648 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e f23676d337db 9a40ab737a73 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 15d600891648 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e f23676d337db 9a40ab737a73 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 096de6bb6fab 096de6bb6fab 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 096de6bb6fab 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 096de6bb6fab 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 096de6bb6fab 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e 79f94eaa3b9e f23676d337db f23676d337db f23676d337db f23676d337db f23676d337db f23676d337db f23676d337db 36b188563094 36b188563094 f23676d337db f23676d337db 36b188563094 79f94eaa3b9e | #
# $Id$
#
# This file is part of the Virtual Leaf.
#
# The Virtual Leaf is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# The Virtual Leaf is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with the Virtual Leaf. If not, see <http://www.gnu.org/licenses/>.
#
# Copyright 2010 Roeland Merks.
#
CONFIG += release
CONFIG -= debug
CONFIG += qt
QMAKE_CXXFLAGS += -fexceptions
QMAKE_CXXFLAGS += -Wall
QMAKE_CXXFLAGS += -Wno-write-strings
QMAKE_CXXFLAGS += -Wno-unused-parameter
QMAKE_CXXFLAGS_DEBUG += -g3
QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
#REACTIONS = reactions_auxin_growth.h
#REACTIONS = reactions_meinhardt.h
#REACTIONS = reactions_pce_growth.h
DEFINES += QTGRAPHICS
DEFINES += REACTIONS_HEADER=$${REACTIONS}
DEFINES += REACTIONS_HEADER_STRING=\"$${REACTIONS}\"
DEFINES += FLEMING
BINDIR = ../bin
LIBDIR = ../lib
DESTDIR = $$BINDIR
TARGET = VirtualLeaf
TEMPLATE = app
PARTMPL = $${TARGET}par.tmpl
MAINSRC = $${TARGET}.cpp
QT -= network sql xml
QT += qt3support
!win32 {
GRAPHICS = qt #qwt
}
win32 {
CONFIG -= console
LIBXML2DIR = $${LIBDIR}\libxml2
LIBICONVDIR = $${LIBDIR}\libiconv
LIBZDIR = $${LIBDIR}\libz
GRAPHICS = qt
RC_FILE = VirtualLeaf.rc
QMAKE_CXXFLAGS += -DLIBXML_STATIC
QMAKE_CXXFLAGS += -I$${LIBXML2DIR}\include -I$${LIBICONVDIR}\include -I$${LIBZDIR}\include
LIBS += -L$${LIBXML2DIR}\lib -lxml2 -L$${LIBICONVDIR}\lib -L$${LIBZDIR}\lib -lz -lm -lwsock32 -liconv
}
macx:release {
LIBS+= -dead_strip
}
unix {
CC = /usr/bin/gcc
QWTDIR = /ufs/guravage/opt/qwt-5.2.1-svn
QMAKE_LIBDIR += $$QWTDIR/lib
QMAKE_CXXFLAGS += -fPIC -I/usr/include/libxml2
QMAKE_LFLAGS += -fPIC
LIBS += -lxml2 -lz -lm
}
# Input
HEADERS += \
# apoplastitem.h \
canvas.h \
cellbase.h \
cell.h \
cellitem.h \
forwardeuler.h \
hull.h \
infobar.h \
mainbase.h \
mainbase.h \
matrix.h \
mesh.h \
modelcatalogue.h \
Neighbor.h \
node.h \
nodeitem.h \
nodeset.h \
OptionFileDialog.h \
output.h \
parameter.h \
pardialog.h \
parse.h \
pi.h \
qcanvasarrow.h \
random.h \
rungekutta.h \
simitembase.h \
simplugin.h \
sqr.h \
tiny.h \
transporterdialog.h \
UniqueMessage.h \
vector.h \
wallbase.h \
wall.h \
wallitem.h \
warning.h \
xmlwrite.h \
$${PARTMPL}
SOURCES += \
# apoplastitem.cpp \
canvas.cpp \
cellbase.cpp \
cell.cpp \
cellitem.cpp \
forwardeuler.cpp \
hull.cpp \
mainbase.cpp \
matrix.cpp \
mesh.cpp \
modelcatalogue.cpp \
Neighbor.cpp \
node.cpp \
nodeitem.cpp \
nodeset.cpp \
OptionFileDialog.cpp \
output.cpp \
parameter.cpp \
pardialog.cpp \
parse.cpp \
random.cpp \
rungekutta.cpp \
simitembase.cpp \
transporterdialog.cpp \
UniqueMessage.cpp \
vector.cpp \
wallbase.cpp \
wall.cpp \
wallitem.cpp \
warning.cpp \
xmlwrite.cpp \
$$MAINSRC
contains( TARGET, leaf_fleming ) {
DEFINES += FLEMING
}
contains(GRAPHICS, qwt) {
#macx:LIBS += -L$$QWTDIR/lib -lqwt
#win32:LIBS += -L$$QWTDIR/lib -lqwt5
#LIBS += -L$$QWTDIR/lib -lqwt
INCLUDEPATH += $$QWTDIR/include
DEFINES += HAVE_QWT
HEADERS += data_plot.h
SOURCES += data_plot.cpp
}
contains( GRAPHICS, qt ) {
message( "Building Qt executable" )
QMAKE_CXXFLAGS += -DQTGRAPHICS # -fpermissive
}
contains( GRAPHICS, xfig ) {
message("Building Xfig executable (background runnable).")
QMAKE_CXXFLAGS += -DXFIGGRAPHICS
}
contains( GRAPHICS, x11 ) {
!unix {
error("X11 graphics only available on Unix systems.")
}
message("Building X11 executable")
SOURCES += x11graph.cpp
HEADERS += x11graph.h
QMAKE_CXXFLAGS += -DX11GRAPHICS
CONFIG -= qt
CONFIG += x11
unix:LIBS += -lpng
}
#contains( GRAPHICS, qwt ) {
# QMAKE_POST_LINK = "install_name_tool -change libqwt.5.dylib $$QWTDIR/lib/libqwt.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}; \
#}
# MACOSX packaging
macx {
ICON = leaficon.icns
QMAKE_POST_LINK = "cp leaficon.icns $${DESTDIR}/$${TARGET}.app; \
cp ../doc/gpl3.txt $${DESTDIR}/$${TARGET}.app/Contents/MacOS/.;"
}
# cd $${BINDIR}; perl ../src/perl/deployapp.pl $${TARGET};"
# finis
|