From 41c2a7399aa155860078566166b7a6cd119221b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Salawa?= Date: Sat, 7 Dec 2024 12:20:32 +0100 Subject: [PATCH] Working on macos-13 runner. --- .github/workflows/mac_release.yml | 3 +++ Plugins/ScriptingTcl/ScriptingTcl.pro | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/mac_release.yml b/.github/workflows/mac_release.yml index 12925e6f4d..3e27ef4613 100644 --- 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 index 332a10de8c..7b4aaf99ef 100644 --- 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