Commit 48aa7d9f authored by loring's avatar loring

system python and qt

support system python on systems that use lib64. Also make
skip install default when using system installs for both
python and qt.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@22878 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5f9a6d6e
......@@ -45,7 +45,6 @@ function python_set_vars_helper
#remove any extra includes
PYTHON_INCLUDE_PATH="${PYTHON_INCLUDE_PATH%%-I*}"
PYTHON_INCLUDE_DIR="$PYTHON_INCLUDE_PATH"
PYTHON_LIBRARY_DIR="${VISIT_PYTHON_DIR}/lib"
PYTHON_LIBRARY=`"$PYTHON_CONFIG_COMMAND" --libs`
#remove all other libraries except for python..
PYTHON_LIBRARY="${PYTHON_LIBRARY##-l*-l}"
......@@ -59,6 +58,16 @@ function python_set_vars_helper
PYTHON_LIBRARY="lib${PYTHON_LIBRARY}.so"
fi
fi
PYTHON_LIBRARY_DIR="${VISIT_PYTHON_DIR}/lib"
if [ ! -e "${PYTHON_LIBRARY_DIR}/${PYTHON_LIBRARY}" ]
then
# some systems eg fedora use lib64...
PYTHON_LIBRARY_DIR="${VISIT_PYTHON_DIR}/lib64"
if [ ! -e "${PYTHON_LIBRARY_DIR}/${PYTHON_LIBRARY}" ]
then
error "python library was not found, cannot configure python"
fi
fi
PYTHON_LIBRARY="${PYTHON_LIBRARY_DIR}/${PYTHON_LIBRARY}"
echo $PYTHON_BUILD_DIR $PYTHON_VERSION $VISIT_PYTHON_DIR
......@@ -147,6 +156,7 @@ function bv_python_host_profile
echo "VISIT_OPTION_DEFAULT(PYTHON_LIBRARY ${PYTHON_LIBRARY})" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(PYTHON_LIBRARY_DIR $PYTHON_LIBRARY_DIR)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(PYTHON_VERSION $PYTHON_COMPATIBILITY_VERSION)" >> $HOSTCONF
echo "SET(VISIT_PYTHON_SKIP_INSTALL ON)" >> $HOSTCONF
else
echo "VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR \${VISITHOME}/python/$PYTHON_VERSION/\${VISITARCH})" \
>> $HOSTCONF
......
......@@ -140,6 +140,7 @@ if [[ "$DO_DBIO_ONLY" != "yes" ]]; then
if [[ $USE_SYSTEM_QT == "yes" ]]; then
echo "VISIT_OPTION_DEFAULT(QT_QTUITOOLS_INCLUDE_DIR ${QT_QTUITOOLS_INCLUDE_DIR})" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${QT_BIN_DIR})" >> $HOSTCONF
echo "SET(VISIT_QT_SKIP_INSTALL ON)" >> $HOSTCONF
else
echo "VISIT_OPTION_DEFAULT(VISIT_QT_BIN \${VISITHOME}/qt/$QT_VERSION/\${VISITARCH}/bin)" >> $HOSTCONF
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment