diff --git a/packaging/conda/bld.bat b/packaging/conda/bld.bat index 6ea3f2a..6c3f0f3 100644 --- a/packaging/conda/bld.bat +++ b/packaging/conda/bld.bat @@ -1,10 +1,13 @@ mkdir build cd build +echo Checking Python version... if %PY_VER% LSS 312 ( set USE_QT6=OFF + echo Python version is less than 312. Using Qt6: %USE_QT6% ) else ( set USE_QT6=ON + echo Python version is greater than or equal to 312. Using Qt6: %USE_QT6% ) cmake -G "Ninja" ^ diff --git a/packaging/conda/build.sh b/packaging/conda/build.sh index 29d7e84..77aca4d 100644 --- a/packaging/conda/build.sh +++ b/packaging/conda/build.sh @@ -1,16 +1,18 @@ mkdir -p build cd build -if [[ ${HOST} =~ .*linux.* && $PY_VER -lt 312 ]]; then +if [[ ${HOST} =~ .*linux.* && ${PY_VER} -lt 312 ]]; then sed -i 's|_qt5gui_find_extra_libs(EGL.*)|_qt5gui_find_extra_libs(EGL "EGL" "" "")|g' $PREFIX/lib/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake sed -i 's|_qt5gui_find_extra_libs(OPENGL.*)|_qt5gui_find_extra_libs(OPENGL "GL" "" "")|g' $PREFIX/lib/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake fi -# Check if PY_VER is less than 312 to determine whether to use Qt6 -if [[ $PY_VER -lt 312 ]]; then - USE_QT6=OFF +echo "Checking Python version..." +if [[ ${PY_VER} -lt 312 ]]; then + USE_QT6=OFF + echo "Python version is less than 312. Using Qt6: $USE_QT6" else - USE_QT6=ON + USE_QT6=ON + echo "Python version is greater than or equal to 312. Using Qt6: $USE_QT6" fi PIVY_CPP_FLAGS='-std=c++1z '