Commit 090bac75 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Used standard installation path for python package 

This does not have to be tested and configured manually :)
parent 6fd5b1c5

CMakeLists.txt

+1 −2
Original line number Diff line number Diff line
@@ -336,8 +336,7 @@ CONFIGURE_FILE( "tnlConfig.h.in" "${PROJECT_BUILD_PATH}/TNL/tnlConfig.h" ) 
INSTALL( FILES ${PROJECT_BUILD_PATH}/TNL/tnlConfig.h DESTINATION include/tnl-${tnlVersion}/TNL )

if( PYTHONINTERP_FOUND )

    CONFIGURE_FILE( "Config.py.in" "${PROJECT_BUILD_PATH}/TNL/Config.py" )

    INSTALL( FILES ${PROJECT_BUILD_PATH}/TNL/Config.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/TNL )

    CONFIGURE_FILE( "python-version.in" "${PROJECT_TOOLS_PATH}/../python-version" )

    INSTALL( FILES ${PROJECT_BUILD_PATH}/TNL/Config.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/TNL )

endif( PYTHONINTERP_FOUND )



#Nastavime cesty k hlavickovym souborum a knihovnam

install

+0 −22
Original line number Diff line number Diff line
@@ -107,27 +107,5 @@ then 
    BUILD_PREFIX="Debug"

fi





PYTHON_TEST="`python src/Tools/python-path-test.py 2> /dev/null`"

#echo "xxxxx ${PYTHON_TEST} xxxxx\n"

if test PYTHON_TEST != "xOK";

then

    source ${BUILD_PREFIX}/python-version    

    echo ""

    echo "WARNING !!!"

    echo ""

    echo "Your system does not see TNL Python modules which were installed right now."

    echo "You need to add it to your system variables PATH and LD_LIBRARY_PATH."

    echo "Add the following to your .bashrc file:"

    echo ""

    echo "if test x\${PYTHONPATH} = x;"

    echo "then"

    echo "   PYTHONPATH=${PREFIX}/lib/python${PYTHON_VERSION}"

    echo "else"

    echo "   PYTHONPATH=\${PYTHONPATH}:${PREFIX}/lib/python${PYTHON_VERSION}"

    echo "fi" 

    echo "export PYTHONPATH" 

fi



exit 0

src/Tools/python-path-test.py

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
import TNL



print( "OK" )