diff --git a/.github/workflows/mac_release.yml b/.github/workflows/mac_release.yml index a664f088c2..621cd2101a 100644 --- a/.github/workflows/mac_release.yml +++ b/.github/workflows/mac_release.yml @@ -1,6 +1,6 @@ env: QT_VERSION: '5.15.2' - TCL_VERSION: '8.6' + TCL_VERSION: '8.6.15' SQLITE_VERSION: '3470100' SQLITE_RELEASE_YEAR: '2024' PYTHON_VERSION: '3.9' @@ -43,15 +43,11 @@ jobs: set -x #brew install tcl-tk@8 #brew reinstall tcl-tk@8 - echo "PATH=/usr/local/opt/tcl-tk/bin:$PATH" >> $GITHUB_ENV + echo "PATH=/usr/local/Cellar/tcl-tk@8/${{ env.TCL_VERSION }}/bin:$PATH" >> $GITHUB_ENV + echo "TCL_CONFIG=/usr/local/Cellar/tcl-tk@8/${{ env.TCL_VERSION }}/lib/tclConfig.sh" >> $GITHUB_ENV find /usr/local -name tclsh find /usr/local -name tclConfig.sh - echo "---" - find $(echo "puts [::tcl::pkgconfig get libdir,runtime]" | /usr/local/bin/tclsh) - echo "---" - find $(echo "puts [::tcl::pkgconfig get libdir,install]" | /usr/local/bin/tclsh) - #find /usr/local/Cellar/tcl-tk@8/8.6.15 - name: Qt installation dir id: qt-installation-dir @@ -196,6 +192,7 @@ jobs: $([ ${{ inputs.use_ccache || false }} = false ] || echo "CONFIG+=ccache") \ CONFIG+=portable \ "INCLUDEPATH+=$pythonLocation/include/python$PYTHON_VERSION" "LIBS += -L$pythonLocation/lib" \ + "TCL_CONFIG=${{ env.TCL_CONFIG }}" ../../../Plugins make -j 1 diff --git a/Plugins/ScriptingTcl/ScriptingTcl.pro b/Plugins/ScriptingTcl/ScriptingTcl.pro index 7b4aaf99ef..de6990caa8 100644 --- a/Plugins/ScriptingTcl/ScriptingTcl.pro +++ b/Plugins/ScriptingTcl/ScriptingTcl.pro @@ -91,14 +91,16 @@ macx: { message("Found tclsh: $$TCLSH (version: $$TCL_VERSION)") # Find tclConfig.sh - TCL_CONFIG = $$system(echo "puts [::tcl::pkgconfig get libdir,runtime]" | tclsh)/tclConfig.sh !exists($$TCL_CONFIG) { - TCL_CONFIG = $$system(echo "puts [::tcl::pkgconfig get libdir,install]" | tclsh)/tclConfig.sh - message("Looking for $$TCL_CONFIG") - } - !exists($$TCL_CONFIG) { - error("Could not find tclConfig.sh file. You can define its absolute path by qmake parameter: TCL_CONFIG=/path/to/tclConfig.sh") - } + TCL_CONFIG = $$system(echo "puts [::tcl::pkgconfig get libdir,runtime]" | tclsh)/tclConfig.sh + !exists($$TCL_CONFIG) { + TCL_CONFIG = $$system(echo "puts [::tcl::pkgconfig get libdir,install]" | tclsh)/tclConfig.sh + message("Looking for $$TCL_CONFIG") + } + !exists($$TCL_CONFIG) { + error("Could not find tclConfig.sh file. You can define its absolute path by qmake parameter: TCL_CONFIG=/path/to/tclConfig.sh") + } + } message("Using tclConfig: $$TCL_CONFIG") # Define other libs required when linking with Tcl