Skip to content
Snippets Groups Projects
Commit f2497439 authored by pospelov's avatar pospelov
Browse files

CONFIG+=BORNAGAIN_PYTHON moved into shared.pri

parent ecbb9811
No related branches found
No related tags found
No related merge requests found
...@@ -36,10 +36,6 @@ int main(int argc, char **argv) ...@@ -36,10 +36,6 @@ int main(int argc, char **argv)
std::cout << AppVersion::g_app_name << " " std::cout << AppVersion::g_app_name << " "
<< AppVersion::g_app_version_number << std::endl; << AppVersion::g_app_version_number << std::endl;
double x = 1.0;
double y = 0.0;
double z = x/y;
ProgramOptions command_line_options; ProgramOptions command_line_options;
AddApplicationOptions(&command_line_options); AddApplicationOptions(&command_line_options);
AddCoreOptions(&command_line_options); AddCoreOptions(&command_line_options);
......
...@@ -102,6 +102,7 @@ LOCATIONS = $$PWD/Core/Algorithms/inc \ ...@@ -102,6 +102,7 @@ LOCATIONS = $$PWD/Core/Algorithms/inc \
INCLUDEPATH += $${LOCATIONS} INCLUDEPATH += $${LOCATIONS}
DEPENDPATH += $${LOCATIONS} DEPENDPATH += $${LOCATIONS}
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# compiler options for debug and release # compiler options for debug and release
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
...@@ -174,8 +175,9 @@ CONFIG(BORNAGAIN_ROOT) { ...@@ -174,8 +175,9 @@ CONFIG(BORNAGAIN_ROOT) {
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# add python API support # add python API support
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# TODO - implement check for existance of numpy/arrayobject.h CONFIG += BORNAGAIN_PYTHON
CONFIG(BORNAGAIN_PYTHON) { CONFIG(BORNAGAIN_PYTHON) {
# TODO - implement check for existance of numpy/arrayobject.h
# user wants to compile python module # user wants to compile python module
WhichPython=$$system(which python) WhichPython=$$system(which python)
isEmpty(WhichPython) { isEmpty(WhichPython) {
...@@ -196,7 +198,7 @@ CONFIG(BORNAGAIN_PYTHON) { ...@@ -196,7 +198,7 @@ CONFIG(BORNAGAIN_PYTHON) {
#LIBS += -L$$pythonsyslibdir -lpython$$pythonvers -lboost_python #LIBS += -L$$pythonsyslibdir -lpython$$pythonvers -lboost_python
LIBS += -lboost_python -L$$pythonsyslibdir -lpython$$pythonvers LIBS += -lboost_python -L$$pythonsyslibdir -lpython$$pythonvers
# we need to know to location of numpy # we need to know the location of numpy
pythonnumpy=$$system("python -c 'import sys; import numpy; sys.stdout.write(numpy.get_include())'") pythonnumpy=$$system("python -c 'import sys; import numpy; sys.stdout.write(numpy.get_include())'")
INCLUDEPATH += $$pythonnumpy INCLUDEPATH += $$pythonnumpy
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment