Skip to content
Snippets Groups Projects
Commit dd3beeed authored by Bienchen's avatar Bienchen
Browse files

SCHWED-4632: Get rid of last traces of Python 2.7

parent 64503dbe
No related branches found
No related tags found
No related merge requests found
set(FFTW_INCLUDE_PATH "/scicore/soft/apps/FFTW/3.3.3-gompi-1.4.10/include/" CACHE PATH "")
set(FFTW_LIBRARY "/scicore/soft/apps/FFTW/3.3.3-gompi-1.4.10/lib/libfftw3f.a" CACHE PATH "")
set(PYTHON_ROOT "/scicore/soft/apps/Python/2.7.5-goolf-1.4.10" CACHE PATH "")
set(EIGEN3_INCLUDE_DIR "/scicore/soft/apps/Eigen/3.2.1-goolf-1.4.10/include/Eigen" CACHE PATH "")
set(BOOST_ROOT "/import/bc2/apps/Boost/1.53.0-goolf-1.4.10-Python-2.7.5" CACHE PATH "")
set(QT_QMAKE_EXECUTABLE "/usr/bin/qmake-qt4" CACHE PATH "")
set(COMPOUND_LIB "/import/bc2/home/schwede/GROUP/OpenStructure/ChemLib/compounds.chemlib" CACHE PATH "")
set(FFTW_INCLUDE_PATH "/scicore/soft/apps/FFTW/3.3.8-gompi-2018b/include/" CACHE PATH "")
set(FFTW_LIBRARY "/scicore/soft/apps/FFTW/3.3.8-gompi-2018b/lib/libfftw3f.a" CACHE PATH "")
set(PYTHON_ROOT "/scicore/soft/apps/Python/3.6.6-foss-2018" CACHE PATH "")
set(EIGEN3_INCLUDE_DIR "/scicore/soft/apps/Eigen/3.3.1/include/Eigen" CACHE PATH "")
set(BOOST_ROOT "/scicore/soft/apps/Boost/1.68.0-foss-2018b-Python-3.6.6" CACHE PATH "")
set(QT_QMAKE_EXECUTABLE "/usr/bin/qmake-qt5" CACHE PATH "")
set(COMPOUND_LIB "/scicore/home/schwede/GROUP/OpenStructure/ChemLib/1.8/compounds.chemlib" CACHE PATH "")
set (CMAKE_BUILD_TYPE "Release" CACHE PATH "")
set(FFTW_INCLUDE_PATH "/scicore/soft/apps/FFTW/3.3.3-gompi-1.4.10/include/" CACHE PATH "")
set(FFTW_LIBRARY "/scicore/soft/apps/FFTW/3.3.3-gompi-1.4.10/lib/libfftw3f.a" CACHE PATH "")
set(FFTW_INCLUDE_PATH "/scicore/soft/apps/FFTW/3.3.8-gompi-2018b/include/" CACHE PATH "")
set(FFTW_LIBRARY "/scicore/soft/apps/FFTW/3.3.8-gompi-2018b/lib/libfftw3f.a" CACHE PATH "")
set(DL_LIBRARIES "/usr/lib64/libdl.a" CACHE PATH "")
set(PTHREAD_LIBRARIES "/usr/lib64/libpthread.a" CACHE PATH "")
set(ZLIB_LIBRARY "/scicore/soft/apps/zlib/1.2.8-goolf-1.4.10/lib/libz.a" CACHE PATH "")
set(PYTHON_ROOT "/scicore/soft/apps/Python/2.7.5-goolf-1.4.10" CACHE PATH "")
set(EIGEN3_INCLUDE_DIR "/scicore/soft/apps/Eigen/3.2.1-goolf-1.4.10/include/Eigen" CACHE PATH "")
set(QT_QMAKE_EXECUTABLE "/usr/bin/qmake-qt4" CACHE PATH "")
set(COMPOUND_LIB "/import/bc2/home/schwede/GROUP/OpenStructure/ChemLib/compounds.chemlib" CACHE PATH "")
set(ZLIB_LIBRARY "/scicore/soft/apps/zlib/1.2.11-GCCcore-7.3.0/lib/libz.a" CACHE PATH "")
set(PYTHON_ROOT "/scicore/soft/apps/Python/3.6.6-foss-2018" CACHE PATH "")
set(EIGEN3_INCLUDE_DIR "/scicore/soft/apps/Eigen/3.3.1/include/Eigen" CACHE PATH "")
set(QT_QMAKE_EXECUTABLE "/usr/bin/qmake-qt5" CACHE PATH "")
set(COMPOUND_LIB "/scicore/home/schwede/GROUP/OpenStructure/ChemLib/1.8/compounds.chemlib" CACHE PATH "")
set (CMAKE_BUILD_TYPE "Release" CACHE PATH "")
......@@ -30,4 +30,4 @@ REM set PATH=%BIN_DIR%;%DNG_ROOT%\@LIBDIR@\@BUILD_TYPE@;%DNG_ROOT%\@LIBDIR@;%DNG
REM "%BIN_DIR%\@BUILD_TYPE@\gosty.exe" "%DNG_ROOT%\@LIBDIR@\openstructure\dng_startup" ost %*
set PATH=%BIN_DIR%;%DNG_ROOT%\@LIBDIR@\;%PATH%
"%DNG_ROOT%\libexec\openstructure\gosty.exe" "%DNG_ROOT%\@LIBDIR@\python2.7\site-packages\ost\dng_startup" ost %*
"%DNG_ROOT%\libexec\openstructure\gosty.exe" "%DNG_ROOT%\@LIBDIR@\python3.6\site-packages\ost\dng_startup" ost %*
......@@ -113,9 +113,9 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
sources = ['$TARBALL_NAME']
builddependencies = [('CMake', '2.8.12')]
builddependencies = [('CMake', '3.10.2')]
pythonversion = "2.7.5"
pythonversion = "3.6.6"
pythonshortversion = ".".join(pythonversion.split(".")[:-1])
dependencies = [
......@@ -149,7 +149,7 @@ sanity_check_paths = {
'dirs': ["include/ost"],
}
# add \$INSTALLDIR/lib64/python2.7/site-packages to PYTHONPATH
# add \$INSTALLDIR/lib64/python3.6/site-packages to PYTHONPATH
modextrapaths = {
'PYTHONPATH': 'lib64/python%s/site-packages' % (pythonshortversion)
}
......
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