diff --git a/BornAgain.pro b/BornAgain.pro index 8ce8d27797d7536df6a3c608bd4806b537d6e463..01f7f7dd548c7dedf75bf79339a394f655f20f56 100644 --- a/BornAgain.pro +++ b/BornAgain.pro @@ -8,7 +8,7 @@ macx|unix { ROOT = $$system(root-config --prefix) } win32 { - ROOT = "C:/root" +# ROOT = "C:/root" } isEmpty(ROOT) { message("No ROOT installation found. libBornAgainFit and App" will not be compiled.) diff --git a/Core/Core.pro b/Core/Core.pro index 6b89a29ea71ed3dd088498144d758e565e47094e..b38142af31e99e1c777fe9c0030e3b7ab4656ff0 100644 --- a/Core/Core.pro +++ b/Core/Core.pro @@ -6,7 +6,7 @@ TEMPLATE = lib CONFIG += lib # to remove versions from file name QT -= core gui #QMAKE_EXTENSION_SHLIB = so # making standard *.so extension -#CONFIG += BORNAGAIN_PYTHON +CONFIG += BORNAGAIN_PYTHON # ----------------------------------------------------------------------------- # common project settings diff --git a/shared.pri b/shared.pri index 8932c475d284a7020cfab6a6efbeb0a0c80a441c..ffc7d0bdb500628c84892df4e0b4dc9455386dc5 100644 --- a/shared.pri +++ b/shared.pri @@ -240,16 +240,26 @@ CONFIG(BORNAGAIN_ROOT) { #CONFIG += BORNAGAIN_PYTHON CONFIG(BORNAGAIN_PYTHON) { # user wants to compile python module - WhichPython=$$system(which python) + macx|unix { + WhichPython=$$system(which python) + } + win32 { + WhichPython="C:/Python27" + } isEmpty(WhichPython) { # we do not have python error("Can not find any sign of python") } else { # we have python - pythonvers=$$system("python -c 'import sys; sys.stdout.write(sys.version[:3])'") - pythonsysincdir=$$system("python -c 'import sys; sys.stdout.write(sys.prefix + \"/include/python\" + sys.version[:3])'") - #pythonsyslibdir=$$system("python -c 'import sys; sys.stdout.write(sys.prefix + \"/lib/python\" + sys.version[:3])'") - pythonsyslibdir=$$system("python -c 'import sys; sys.stdout.write(sys.prefix + \"/lib\" )'") + pythonvers=$$system("python -c \"import sys; sys.stdout.write(sys.version[:3])\" ") + macx|unix { + pythonsysincdir=$$system("python -c 'import sys; sys.stdout.write(sys.prefix + \"/include/python\" + sys.version[:3])'") + pythonsyslibdir=$$system("python -c 'import sys; sys.stdout.write(sys.prefix + \"/lib\" )'") + } + win32 { + pythonsysincdir=$${WhichPython}/include + pythonsyslibdir=$${WhichPython}/libs + } #message(we have python) #message($$pythonvers) #message($$pythonsysincdir) @@ -260,7 +270,7 @@ CONFIG(BORNAGAIN_PYTHON) { LIBS += -lboost_python -L$$pythonsyslibdir -lpython$$pythonvers # 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())\" ") !exists($$pythonnumpy/numpy/arrayobject.h): error("Can't find numpy/arrayobject.h in $$pythonnumpy, you have to install python-numpy-devel") INCLUDEPATH += $$pythonnumpy }