zcy
/
openEMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

project file updates 

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
pull/1/head
Thorsten Liebig 2012-12-04 16:47:01 +01:00
parent 2c8dcb7089
commit a912d438a9
3 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ Makefile*
*.pro.user* *.pro.user*
*.orig *.orig
openEMS openEMS
localPathes.pri

12
nf2ff/nf2ff.pro
View File

@ -5,6 +5,10 @@ CONFIG += debug_and_release
VERSION = 0.1.0 VERSION = 0.1.0
exists(localPathes.pri) {
include(localPathes.pri)
}
win32 { win32 {
CONFIG += console CONFIG += console
@ -87,9 +91,13 @@ QMAKE_CXXFLAGS_DEBUG = -O0 \
# #
# INSTALL (only the nf2ff executable) # INSTALL (only the nf2ff executable)
# #
isEmpty(PREFIX) {
PREFIX = /usr/local
}
install.target = install install.target = install
install.commands = mkdir -p \"$(INSTALL_ROOT)/usr/bin\" install.commands = mkdir -p \"$$PREFIX/bin\"
install.commands += && cp -at \"$(INSTALL_ROOT)/usr/bin/\" nf2ff unix:install.commands += && cp -at \"$$PREFIX/bin/\" nf2ff
win32:install.commands += && cp -at \"$$PREFIX/bin/\" release/nf2ff.exe
QMAKE_EXTRA_TARGETS += install QMAKE_EXTRA_TARGETS += install

30
openEMS.pro
View File

@ -14,6 +14,17 @@ CONFIG += debug_and_release
# #
VERSION=0.0.29 VERSION=0.0.29
# add git revision
GITREV = $$system(git describe --tags)
isEmpty(GITREV):GITREV=$$VERSION
DEFINES += GIT_VERSION=\\\"$$GITREV\\\"
# remove unnecessary webkit define
DEFINES -= QT_WEBKIT
exists(localPathes.pri) {
include(localPathes.pri)
}
############################################################################### ###############################################################################
# CONFIG SECTION # CONFIG SECTION
@ -262,13 +273,6 @@ MPI_SUPPORT {
QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter #needed because mpich2 produces tons of unused parameter QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter #needed because mpich2 produces tons of unused parameter
} }
# add git revision
GITREV = $$system(git describe --tags)
isEmpty(GITREV):GITREV=$$VERSION
DEFINES += GIT_VERSION=\\\"$$GITREV\\\"
# #
@ -282,11 +286,15 @@ QMAKE_EXTRA_TARGETS += tarball
# #
# INSTALL (only the openEMS executable and matlab scripts) # INSTALL (only the openEMS executable and matlab scripts)
# #
isEmpty(PREFIX) {
PREFIX = /usr/local
}
install.target = install install.target = install
install.commands = mkdir -p \"$(INSTALL_ROOT)/usr/bin\" install.commands = mkdir -p \"$$PREFIX/bin\"
install.commands += && mkdir -p \"$(INSTALL_ROOT)/usr/share/openEMS/matlab\" install.commands += && mkdir -p \"$$PREFIX/share/openEMS/matlab\"
install.commands += && cp -at \"$(INSTALL_ROOT)/usr/bin/\" openEMS.sh openEMS_MPI.sh openEMS unix:install.commands += && cp -at \"$$PREFIX/bin/\" openEMS.sh openEMS_MPI.sh openEMS
install.commands += && cp -at \"$(INSTALL_ROOT)/usr/share/openEMS/\" matlab/ win32:install.commands += && cp -at \"$$PREFIX/bin/\" release/openEMS.exe
install.commands += && cp -at \"$$PREFIX/share/openEMS/\" matlab/
QMAKE_EXTRA_TARGETS += install QMAKE_EXTRA_TARGETS += install