compile fixes
Sebastian Held
parent
07890c4da8
commit
1509e80454
|
|
@ -8,7 +8,7 @@
|
|||
# This is the debhelper compatibility version to use.
|
||||
export DH_COMPAT=4
|
||||
|
||||
CFLAGS = -g
|
||||
CFLAGS = -g -msse
|
||||
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
|
||||
CFLAGS += -O0
|
||||
else
|
||||
|
|
@ -20,12 +20,10 @@ build-stamp:
|
|||
dh_testdir
|
||||
|
||||
# Add here commands to compile the package.
|
||||
qmake-qt4 QMAKE_CFLAGS="$$CFLAGS" QMAKE_CXXFLAGS="$$CFLAGS" openEMS.pro
|
||||
qmake-qt4 QMAKE_CFLAGS="$$CFLAGS" QMAKE_CXXFLAGS="$$CFLAGS" CONFIG+=packaging openEMS.pro
|
||||
make
|
||||
cd nf2ff
|
||||
qmake-qt4 QMAKE_CFLAGS="$$CFLAGS" QMAKE_CXXFLAGS="$$CFLAGS" nf2ff.pro
|
||||
make
|
||||
cd ..
|
||||
cd nf2ff && qmake-qt4 QMAKE_CFLAGS="$$CFLAGS" QMAKE_CXXFLAGS="$$CFLAGS" CONFIG+=packaging nf2ff.pro
|
||||
make -C nf2ff
|
||||
# --- end custom part for compiling
|
||||
|
||||
touch build-stamp
|
||||
|
|
@ -37,6 +35,7 @@ clean:
|
|||
|
||||
# Add here commands to clean up after the build process.
|
||||
make clean || true
|
||||
make -C nf2ff clean || true
|
||||
# --- end custom part for cleaning up
|
||||
|
||||
dh_clean
|
||||
|
|
@ -50,9 +49,7 @@ install: build
|
|||
# Add here commands to install the package
|
||||
# The DESTDIR Has To Be Exactly /usr/src/packages/BUILD/debian/<nameOfPackage>
|
||||
make install INSTALL_ROOT=/usr/src/packages/BUILD/debian/openems
|
||||
cd nf2ff
|
||||
make install INSTALL_ROOT=/usr/src/packages/BUILD/debian/openems
|
||||
cd ..
|
||||
make -C nf2ff install INSTALL_ROOT=/usr/src/packages/BUILD/debian/openems
|
||||
# --- end custom part for installing
|
||||
|
||||
# Build architecture-independent files here.
|
||||
|
|
|
|||
|
|
@ -57,10 +57,10 @@ OpenEMS is a free and open-source electromagnetic field solver using the (EC-)FD
|
|||
|
||||
%build
|
||||
ADDFLAGS="-msse" # enable at least the SSE command set (no SSE makes no sense -- way too slow)
|
||||
%qmake QMAKE_CFLAGS="%optflags $ADDFLAGS" QMAKE_CXXFLAGS="%optflags $ADDFLAGS" LIB_SUFFIX="$(echo %_lib | cut -b4-)" openEMS.pro
|
||||
%qmake QMAKE_CFLAGS="%optflags $ADDFLAGS" QMAKE_CXXFLAGS="%optflags $ADDFLAGS" LIB_SUFFIX="$(echo %_lib | cut -b4-)" CONFIG+=packaging openEMS.pro
|
||||
make %{?_smp_mflags}
|
||||
cd nf2ff
|
||||
%qmake QMAKE_CFLAGS="%optflags $ADDFLAGS" QMAKE_CXXFLAGS="%optflags $ADDFLAGS" LIB_SUFFIX="$(echo %_lib | cut -b4-)" nf2ff.pro
|
||||
%qmake QMAKE_CFLAGS="%optflags $ADDFLAGS" QMAKE_CXXFLAGS="%optflags $ADDFLAGS" LIB_SUFFIX="$(echo %_lib | cut -b4-)" CONFIG+=packaging nf2ff.pro
|
||||
make %{?_smp_mflags}
|
||||
cd ..
|
||||
|
||||
|
|
|
|||
|
|
@ -6,19 +6,21 @@ CONFIG += debug_and_release
|
|||
|
||||
win32 {
|
||||
CONFIG += console
|
||||
QMAKE_CXXFLAGS += -DH5_USE_16_API
|
||||
INCLUDEPATH += ../../hdf5/include ../../hdf5/include/cpp ../../boost/include/boost-1_42
|
||||
LIBS += ../../hdf5/lib/hdf5.lib
|
||||
LIBS += ../../boost/lib/libboost_thread-mgw44-mt.lib
|
||||
LIBS += ../../tinyxml/release/libtinyxml2.a
|
||||
}
|
||||
!win32 {
|
||||
LIBS += -lboost_thread
|
||||
LIBS += -lboost_thread-mt
|
||||
LIBS += -lhdf5
|
||||
LIBS += ../../tinyxml/libtinyxml.so
|
||||
LIBS += -L../tinyxml -ltinyxml
|
||||
}
|
||||
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../../tinyxml\'
|
||||
|
||||
# hdf5 compat
|
||||
DEFINES += H5_USE_16_API
|
||||
|
||||
TOOLSPATH = ../tools
|
||||
|
||||
#### SOURCES ################################################################
|
||||
|
|
@ -46,12 +48,16 @@ HEADERS += $$TOOLSPATH/constants.h \
|
|||
$$TOOLSPATH/hdf5_file_reader.h \
|
||||
$$TOOLSPATH/hdf5_file_writer.h
|
||||
|
||||
!packaging {
|
||||
# if packaging is not set in CONFIG, set some default flags
|
||||
# if packaging is enabled, give the flags on the qmake comandline
|
||||
QMAKE_CXXFLAGS_RELEASE = -O3 \
|
||||
-g \
|
||||
-march=native
|
||||
QMAKE_CXXFLAGS_DEBUG = -O0 \
|
||||
-g \
|
||||
-march=native
|
||||
}
|
||||
|
||||
# add git revision
|
||||
# QMAKE_CXXFLAGS += -DGIT_VERSION=\\\"`git describe --tags`\\\"
|
||||
|
|
|
|||
52
openEMS.pro
52
openEMS.pro
|
|
@ -2,11 +2,9 @@
|
|||
# Project created by QtCreator 2010-02-26T22:34:51
|
||||
# -------------------------------------------------
|
||||
TARGET = openEMS
|
||||
CONFIG += console
|
||||
CONFIG -= app_bundle qt
|
||||
TEMPLATE = app
|
||||
OBJECTS_DIR = obj
|
||||
INCLUDEPATH += .
|
||||
INCLUDEPATH += ../CSXCAD \
|
||||
../fparser \
|
||||
../tinyxml
|
||||
|
|
@ -37,10 +35,10 @@ VERSION=0.0.27
|
|||
WIN32_LIB_ROOT = ..
|
||||
|
||||
win32 {
|
||||
QMAKE_CXXFLAGS += -DH5_USE_16_API
|
||||
INCLUDEPATH += $$WIN32_LIB_ROOT/hdf5/include $$WIN32_LIB_ROOT/hdf5/include/cpp $$WIN32_LIB_ROOT/boost/include/boost-1_42
|
||||
LIBS += $$WIN32_LIB_ROOT/hdf5/lib/hdf5.lib
|
||||
LIBS += $$WIN32_LIB_ROOT/boost/lib/libboost_thread-mgw44-mt.lib
|
||||
CONFIG += console
|
||||
INCLUDEPATH += $$WIN32_LIB_ROOT/hdf5/include $$WIN32_LIB_ROOT/hdf5/include/cpp $$WIN32_LIB_ROOT/boost/include/boost-1_42
|
||||
LIBS += $$WIN32_LIB_ROOT/hdf5/lib/hdf5.lib
|
||||
LIBS += $$WIN32_LIB_ROOT/boost/lib/libboost_thread-mgw44-mt.lib
|
||||
LIBS += -L../CSXCAD/release
|
||||
LIBS += ../fparser/release/libfparser4.a
|
||||
LIBS += ../tinyxml/release/libtinyxml2.a
|
||||
|
|
@ -59,7 +57,7 @@ win32 {
|
|||
!win32 {
|
||||
LIBS += -L../fparser -lfparser
|
||||
LIBS += -L../tinyxml -ltinyxml
|
||||
LIBS += -lboost_thread
|
||||
LIBS += -lboost_thread-mt
|
||||
LIBS += -lhdf5 -lhdf5_cpp
|
||||
### vtk ###
|
||||
INCLUDEPATH += /usr/include/vtk-5.2 \
|
||||
|
|
@ -77,6 +75,10 @@ QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../CSXCAD\'
|
|||
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../fparser\'
|
||||
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../tinyxml\'
|
||||
|
||||
# hdf5 compat
|
||||
DEFINES += H5_USE_16_API
|
||||
|
||||
|
||||
#### SOURCES ################################################################
|
||||
SOURCES += main.cpp \
|
||||
openems.cpp
|
||||
|
|
@ -128,8 +130,8 @@ SOURCES += Common/operator_base.cpp \
|
|||
Common/processfields_td.cpp \
|
||||
Common/processcurrent.cpp \
|
||||
Common/processfields_fd.cpp \
|
||||
Common/processfieldprobe.cpp \
|
||||
Common/processfields_sar.cpp
|
||||
Common/processfieldprobe.cpp \
|
||||
Common/processfields_sar.cpp
|
||||
|
||||
# tools
|
||||
SOURCES += tools/global.cpp \
|
||||
|
|
@ -156,9 +158,9 @@ HEADERS += FDTD/engine.h \
|
|||
FDTD/operator_multithread.h \
|
||||
FDTD/operator_cylindermultigrid.h \
|
||||
FDTD/engine_cylindermultigrid.h \
|
||||
FDTD/engine_interface_fdtd.h \
|
||||
FDTD/engine_interface_sse_fdtd.h \
|
||||
FDTD/engine_interface_cylindrical_fdtd.h
|
||||
FDTD/engine_interface_fdtd.h \
|
||||
FDTD/engine_interface_sse_fdtd.h \
|
||||
FDTD/engine_interface_cylindrical_fdtd.h
|
||||
|
||||
# FDTD/extensions header files
|
||||
HEADERS += FDTD/extensions/operator_extension.h \
|
||||
|
|
@ -191,7 +193,7 @@ HEADERS += Common/operator_base.h \
|
|||
Common/processmodematch.h \
|
||||
Common/processfields_fd.h \
|
||||
Common/processfieldprobe.h \
|
||||
Common/processfields_sar.h
|
||||
Common/processfields_sar.h
|
||||
|
||||
# tools
|
||||
HEADERS += tools/ErrorMsg.h \
|
||||
|
|
@ -204,27 +206,31 @@ HEADERS += tools/ErrorMsg.h \
|
|||
tools/vtk_file_writer.h \
|
||||
tools/hdf5_file_writer.h
|
||||
|
||||
!packaging {
|
||||
# if packaging is not set in CONFIG, set some default flags
|
||||
# if packaging is enabled, give the flags on the qmake comandline
|
||||
QMAKE_CXXFLAGS_RELEASE = -O3 \
|
||||
-g \
|
||||
-march=native
|
||||
QMAKE_CXXFLAGS_DEBUG = -O0 \
|
||||
-g \
|
||||
-march=native
|
||||
}
|
||||
|
||||
MPI_SUPPORT {
|
||||
DEFINES += MPI_SUPPORT
|
||||
QMAKE_CC = mpicc
|
||||
QMAKE_CXX = mpicxx
|
||||
QMAKE_LINK = mpicxx
|
||||
QMAKE_LINK_C = mpicc
|
||||
DEFINES += MPI_SUPPORT
|
||||
QMAKE_CC = mpicc
|
||||
QMAKE_CXX = mpicxx
|
||||
QMAKE_LINK = mpicxx
|
||||
QMAKE_LINK_C = mpicc
|
||||
HEADERS += FDTD/operator_mpi.h \
|
||||
FDTD/engine_mpi.h \
|
||||
FDTD/openems_fdtd_mpi.h
|
||||
FDTD/engine_mpi.h \
|
||||
FDTD/openems_fdtd_mpi.h
|
||||
SOURCES += FDTD/operator_mpi.cpp \
|
||||
FDTD/engine_mpi.cpp \
|
||||
FDTD/openems_fdtd_mpi.cpp
|
||||
FDTD/engine_mpi.cpp \
|
||||
FDTD/openems_fdtd_mpi.cpp
|
||||
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue