From f2497439e77ffb79bfd775ecd4153a6d8e0b32ad Mon Sep 17 00:00:00 2001
From: pospelov <pospelov@fz-juelich.de>
Date: Wed, 27 Mar 2013 13:19:54 +0100
Subject: [PATCH] CONFIG+=BORNAGAIN_PYTHON moved into shared.pri
---
App/src/main.cpp | 4 ----
shared.pri | 6 ++++--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/App/src/main.cpp b/App/src/main.cpp
index 3f2b0dbf31a..9ede1874776 100644
--- a/App/src/main.cpp
+++ b/App/src/main.cpp
@@ -36,10 +36,6 @@ int main(int argc, char **argv)
std::cout << AppVersion::g_app_name << " "
<< AppVersion::g_app_version_number << std::endl;
- double x = 1.0;
- double y = 0.0;
- double z = x/y;
-
ProgramOptions command_line_options;
AddApplicationOptions(&command_line_options);
AddCoreOptions(&command_line_options);
diff --git a/shared.pri b/shared.pri
index 6ccacf62b50..ed3e5620c7a 100644
--- a/shared.pri
+++ b/shared.pri
@@ -102,6 +102,7 @@ LOCATIONS = $$PWD/Core/Algorithms/inc \
INCLUDEPATH += $${LOCATIONS}
DEPENDPATH += $${LOCATIONS}
+
# -----------------------------------------------------------------------------
# compiler options for debug and release
# -----------------------------------------------------------------------------
@@ -174,8 +175,9 @@ CONFIG(BORNAGAIN_ROOT) {
# -----------------------------------------------------------------------------
# add python API support
# -----------------------------------------------------------------------------
-# TODO - implement check for existance of numpy/arrayobject.h
+CONFIG += BORNAGAIN_PYTHON
CONFIG(BORNAGAIN_PYTHON) {
+ # TODO - implement check for existance of numpy/arrayobject.h
# user wants to compile python module
WhichPython=$$system(which python)
isEmpty(WhichPython) {
@@ -196,7 +198,7 @@ CONFIG(BORNAGAIN_PYTHON) {
#LIBS += -L$$pythonsyslibdir -lpython$$pythonvers -lboost_python
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())'")
INCLUDEPATH += $$pythonnumpy
}
--
GitLab