diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2016-06-13 18:42:57 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2016-06-13 18:42:57 -0400 |
| commit | 65d5f68cc6dc81799c5a5d90400a2c1f0dd02547 (patch) | |
| tree | 6f245ba901b87ef42fed69965aea22f5eea6b590 /Plugins/ScriptingTcl/ScriptingTcl.pro | |
| parent | aeb6bad01630d325a4e768e798a7a6d44e18fdaf (diff) | |
| parent | 5d9314f134ddd3dc4c853e398ac90ba247fb2e4f (diff) | |
Merge tag 'upstream/3.1.0'
Upstream version 3.1.0
# gpg: Signature made Mon 13 Jun 2016 06:42:54 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'Plugins/ScriptingTcl/ScriptingTcl.pro')
| -rw-r--r-- | Plugins/ScriptingTcl/ScriptingTcl.pro | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/Plugins/ScriptingTcl/ScriptingTcl.pro b/Plugins/ScriptingTcl/ScriptingTcl.pro index d888a32..86fa734 100644 --- a/Plugins/ScriptingTcl/ScriptingTcl.pro +++ b/Plugins/ScriptingTcl/ScriptingTcl.pro @@ -81,19 +81,27 @@ linux: { macx: { # Find tclsh - TCLSH = $$system(echo "puts 1" | tclsh) - !contains(TCLSH, 1): { - error("Could not find tclsh executable. ScriptingTcl plugin requires it to find out all Tcl libraries and headers. Make tclsh available in PATH.") - } - TCLSH = $$system(which tclsh) + #TCLSH = $$system(echo "puts 1" | tclsh) + #!contains(TCLSH, 1): { + # error("Could not find tclsh executable. ScriptingTcl plugin requires it to find out all Tcl libraries and headers. Make tclsh available in PATH.") + #} + #TCLSH = $$system(which tclsh) # Find its version - TCL_VERSION = $$system(echo "puts [info tclversion]" | tclsh) + #TCL_VERSION = $$system(echo "puts [info tclversion]" | tclsh) #message("Found tclsh: $$TCLSH (version: $$TCL_VERSION)") # Find tclConfig.sh - TCL_CONFIG_DIR = $$system(echo "puts [info library]" | tclsh) - TCL_CONFIG = $$TCL_CONFIG_DIR/../../tclConfig.sh + #TCL_CONFIG_DIR = $$system(echo "puts [info library]" | tclsh) + #TCL_CONFIG = $$TCL_CONFIG_DIR/../../tclConfig.sh + + XCRUN = $$system(xcrun --version) + !contains(XCRUN, xcrun): { + error("Could not find xcrun executable. ScriptingTcl plugin requires it to find out all Tcl libraries and headers.") + } + + SDK_PATH = $$system(xcrun --show-sdk-path) + TCL_CONFIG = $$SDK_PATH/System/Library/Frameworks/Tcl.framework/Versions/Current/tclConfig.sh # Define other libs required when linking with Tcl eval($$system(cat $$TCL_CONFIG | grep TCL_LIBS)) |