Working on macos-13 runner.

pawelsalawa · Dec 7, 2024 · 41c2a73 · 41c2a73
1 parent 756d833
commit 41c2a73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/.github/workflows/mac_release.yml b/.github/workflows/mac_release.yml
@@ -49,6 +49,9 @@ jobs:
                 ls -l /System/Library/Frameworks/Tcl.framework/Versions/8.5
                 find /System/Library/Frameworks/Tcl.framework -name tclConfig.sh
                 find / -name tclConfig.sh
+                echo "---"
+                ls -l $(echo "puts [::tcl::pkgconfig get libdir,runtime]" | tclsh)/tclConfig.sh
+                ls -l $(echo "puts [::tcl::pkgconfig get libdir,install]" | tclsh)/tclConfig.sh
 
             - name: Qt installation dir
               id: qt-installation-dir

diff --git a/Plugins/ScriptingTcl/ScriptingTcl.pro b/Plugins/ScriptingTcl/ScriptingTcl.pro
@@ -92,6 +92,13 @@ macx: {
 
     # 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")
+    }
     message("Using tclConfig: $$TCL_CONFIG")
 
     # Define other libs required when linking with Tcl