diff --git a/nf2ff/nf2ff.pro b/nf2ff/nf2ff.pro index f873f6c..bbef55b 100644 --- a/nf2ff/nf2ff.pro +++ b/nf2ff/nf2ff.pro @@ -8,7 +8,9 @@ VERSION = 0.1.0 win32 { CONFIG += console - WIN32_LIB_ROOT = ../.. + isEmpty(WIN32_LIB_ROOT) { + WIN32_LIB_ROOT = ../.. + } # #3rd party libraries# # tinyxml diff --git a/openEMS.pro b/openEMS.pro index 11ccbcf..8e8aa7a 100644 --- a/openEMS.pro +++ b/openEMS.pro @@ -31,10 +31,15 @@ VERSION=0.0.29 win32 { CONFIG += console - WIN32_LIB_ROOT = .. + isEmpty(WIN32_LIB_ROOT) { + WIN32_LIB_ROOT = .. + } + isEmpty(CSXCAD_ROOT) { + CSXCAD_ROOT = $$WIN32_LIB_ROOT/CSXCAD + } # CSXCAD - INCLUDEPATH += $$WIN32_LIB_ROOT/CSXCAD - LIBS += -L$$WIN32_LIB_ROOT/CSXCAD/release -lCSXCAD0 + INCLUDEPATH += $$CSXCAD_ROOT/include/CSXCAD + LIBS += -L$$CSXCAD_ROOT/lib -lCSXCAD0 # #3rd party libraries# # tinyxml @@ -58,19 +63,23 @@ win32 { LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lvtkIO -lvtkFiltering } !win32 { + # CSXCAD + isEmpty(CSXCAD_ROOT) { + CSXCAD_ROOT = /usr + } + INCLUDEPATH += $$CSXCAD_ROOT/include/CSXCAD + LIBS += -L$$CSXCAD_ROOT/lib -lCSXCAD + + # #3rd party libraries# LIBS += -lfparser LIBS += -ltinyxml DEFINES += TIXML_USE_STL LIBS += -lboost_thread-mt LIBS += -lCGAL - LIBS += -llapack # hdf5 (and mpi for parallel hdf5) LIBS += -lhdf5_hl -lhdf5 LIBS += -lmpi -lmpi_cxx INCLUDEPATH += /usr/include/mpi - # CSXCAD - INCLUDEPATH += ../CSXCAD - LIBS += -L../CSXCAD -lCSXCAD ### vtk ### INCLUDEPATH += /usr/include/vtk-5.2 \ /usr/include/vtk-5.4 \