diff --git a/GUI/coregui/coregui.pro b/GUI/coregui/coregui.pro index 607ec7befdf4a0612fd5e33068e8487fe6e7389e..e392f29a00d8ce17a17569fd00b40f4b61836c18 100644 --- a/GUI/coregui/coregui.pro +++ b/GUI/coregui/coregui.pro @@ -1,7 +1,7 @@ # ----------------------------------------------------------------------------- # qmake project file to compile GUI core # ----------------------------------------------------------------------------- -QT += core gui script webkit webkitwidgets designer designercomponents +QT = core gui script webkit webkitwidgets designer designercomponents #QT += core gui script webkit webkitwidgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = coregui @@ -9,6 +9,7 @@ TEMPLATE = app #CONFIG -= app_bundle #CONFIG += BORNAGAIN_ROOT BORNAGAIN_PYTHON +#CONFIG -= qt include($$PWD/../../shared.pri) @@ -61,18 +62,20 @@ RESOURCES += coregui.qrc FORMS += \ form.ui -myIncludes = $$PWD/mainwindow $$PWD/utils $$PWD/Views $$PWD/Models +myIncludes = $$PWD/mainwindow $$PWD/utils $$PWD/Views $$PWD/Models $$PWD/ # ----------------------------------------------------------------------------- # dependencies # ----------------------------------------------------------------------------- DEPENDPATH += $$myIncludes -INCLUDEPATH += $$myIncludes -INCLUDEPATH *= $$EIGEN_INCLUDE_DIR -INCLUDEPATH *= $$BOOST_INCLUDE_DIR -INCLUDEPATH += $$BornAgainCore_INCLUDE_DIR +INCLUDEPATH += $$myIncludes $$BornAgainCore_INCLUDE_DIR +INCLUDEPATH += $$EIGEN_INCLUDE_DIR INCLUDEPATH += $$ROOT_INCLUDE_DIR + +message("XXX $$ROOT_INCLUDE_DIR") INCLUDEPATH += $$PYTHON_INCLUDE_DIR +INCLUDEPATH += $$BOOST_INCLUDE_DIR + LIBS += $$BOOST_LIBRARY $$BornAgainCore_LIBRARY $$ROOT_LIBRARY $$PYTHON_LIBRARY LIBS += $$PWD/../../lib/libManhattanStyle.so diff --git a/shared.pri b/shared.pri index 862e19b65956c8bbbc2df01e42a28608159b8201..741dee9c15a0bf1b023d8099b66ee5d8b9385f59 100644 --- a/shared.pri +++ b/shared.pri @@ -59,7 +59,7 @@ gtest_LIBRARY = $$PWD/lib/$${SOPREFIX}gtest.$${SONAME} # --- checking gsl header --- GSL_HEADERFILE = gsl/gsl_sf_bessel.h macx|unix { - GSL_HEADER_LOCATIONS = /opt/local/include /usr/local/include /usr/include + GSL_HEADER_LOCATIONS = /opt/local2/include /opt/local/include /usr/local/include /usr/include } win32 { GSL_HEADER_LOCATIONS = "C:/opt/local/include" @@ -77,7 +77,7 @@ win32 { # --- checking eigen headers --- EIGEN_HEADERFILE = Eigen/Core macx|unix { - EIGEN_HEADER_LOCATIONS = /opt/local/include /opt/local/include/eigen3 /usr/local/include /usr/include + EIGEN_HEADER_LOCATIONS = /opt/local2/include /opt/local/include /opt/local/include/eigen3 /usr/local/include /usr/include } win32 { EIGEN_HEADER_LOCATIONS = "C:/opt/local/include" @@ -91,7 +91,7 @@ isEmpty(EIGEN_INCLUDE_DIR) { # --- checking fftw3 --- FFTW3_HEADERFILE = fftw3.h macx|unix { - FFTW3_HEADER_LOCATIONS = /opt/local/include /usr/local/include /usr/include + FFTW3_HEADER_LOCATIONS = /opt/local2/include /opt/local/include /usr/local/include /usr/include FFTW3_LIBNAME = fftw3 } win32 { @@ -106,7 +106,7 @@ FFTW3_LIBRARY = -L$${FFTW3_LIBRARY_DIR} -l$${FFTW3_LIBNAME} # --- checking boost --- BOOST_HEADERFILE = boost/version.hpp macx|unix { - BOOST_HEADER_LOCATIONS = /opt/local/include /usr/local/include /usr/include + BOOST_HEADER_LOCATIONS = /opt/local2/include /opt/local/include /usr/local/include /usr/include } win32 { BOOST_HEADER_LOCATIONS = "C:/opt/local/include" @@ -151,15 +151,15 @@ isEqual(env_jcns_variable, "yes") { CONFIG += BORNAGAIN_JCNS } -CONFIG(BORNAGAIN_JCNS) { - message("Special config for JCNS") - INCLUDEPATH += /usr/users/jcns/pospelov/software/include - OLD_LIBS = $$LIBS - LIBS = -L/usr/users/jcns/pospelov/software/lib -L/usr/local/lib -L/usr/lib64 \ - -lgsl -lgslcblas -lfftw3 -lboost_program_options -lboost_iostreams \ - -lboost_system -lboost_signals -lboost_filesystem -lboost_regex \ - -lboost_thread $$OLD_LIBS -} +#CONFIG(BORNAGAIN_JCNS) { +# message("Special config for JCNS") +# INCLUDEPATH += /usr/users/jcns/pospelov/software/include +# OLD_LIBS = $$LIBS +# LIBS = -L/usr/users/jcns/pospelov/software/lib -L/usr/local/lib -L/usr/lib64 \ +# -lgsl -lgslcblas -lfftw3 -lboost_program_options -lboost_iostreams \ +# -lboost_system -lboost_signals -lboost_filesystem -lboost_regex \ +# -lboost_thread $$OLD_LIBS +#} # ----------------------------------------------------------------------------- # compiler options for debug and release