浏览代码

ENH: support for cygwin

Bill Hoffman 24 年之前
父节点
当前提交
8db8e7bb22
共有 1 个文件被更改,包括 12 次插入1 次删除
  1. 12 1
      Modules/FindTCL.cmake

+ 12 - 1
Modules/FindTCL.cmake

@@ -12,10 +12,21 @@
 #  TK_WISH          = the full path to the wish binary (wish wish80 etc)
 #  TK_WISH          = the full path to the wish binary (wish wish80 etc)
 #
 #
 
 
+# if unix look for the cyg version first to avoid finding it 
+# on a windows box running only win32 builds
+IF(UNIX)
+  FIND_PROGRAM(TCL_TCLSH cygtclsh80)
+ENDIF(UNIX)
+
 FIND_PROGRAM(TCL_TCLSH
 FIND_PROGRAM(TCL_TCLSH
-  NAMES tclsh tclsh84 tclsh83 tclsh82 tclsh80
+  NAMES cygtclsh80 tclsh tclsh84 tclsh83 tclsh82 tclsh80
 )
 )
 
 
+# if UNIX is defined, then look for the cygwin version first
+IF(UNIX)
+  FIND_PROGRAM(TK_WISH cygwish80 )
+ENDIF(UNIX)
+
 FIND_PROGRAM(TK_WISH
 FIND_PROGRAM(TK_WISH
   NAMES wish wish84 wish83 wish82 wish80
   NAMES wish wish84 wish83 wish82 wish80
 )
 )