summaryrefslogtreecommitdiffstats
path: root/Modules/FindTCL.cmake
diff options
context:
space:
mode:
authorSebastien Barre <sebastien.barre@kitware.com>2008-01-25 00:31:24 (GMT)
committerSebastien Barre <sebastien.barre@kitware.com>2008-01-25 00:31:24 (GMT)
commitaf9987ed79a7e34173c41c439f002dd940b07861 (patch)
tree0c61a6c058c6c5477b5190959697d86fb5a209f4 /Modules/FindTCL.cmake
parentf1c5b50cb7ede677ea16c64da942397c42bdc6d5 (diff)
downloadCMake-af9987ed79a7e34173c41c439f002dd940b07861.zip
CMake-af9987ed79a7e34173c41c439f002dd940b07861.tar.gz
CMake-af9987ed79a7e34173c41c439f002dd940b07861.tar.bz2
ENH: update for Tcl/Tk 8.5
Diffstat (limited to 'Modules/FindTCL.cmake')
-rw-r--r--Modules/FindTCL.cmake12
1 files changed, 10 insertions, 2 deletions
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index 2d3e23f..8a6a1ee 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -125,6 +125,8 @@ SET (TCLTK_POSSIBLE_INCLUDE_PATHS
"${TK_LIBRARY_PATH_PARENT}/include"
"${TCL_INCLUDE_PATH}"
"${TK_INCLUDE_PATH}"
+ ${TCL_FRAMEWORK_INCLUDES}
+ ${TK_FRAMEWORK_INCLUDES}
"${TCL_TCLSH_PATH_PARENT}/include"
"${TK_WISH_PATH_PARENT}/include"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
@@ -148,11 +150,17 @@ SET (TCLTK_POSSIBLE_INCLUDE_PATHS
)
FIND_PATH(TCL_INCLUDE_PATH tcl.h
- ${TCL_FRAMEWORK_INCLUDES} ${TCLTK_POSSIBLE_INCLUDE_PATHS}
+ ${TCLTK_POSSIBLE_INCLUDE_PATHS} NO_DEFAULT_PATH
+)
+FIND_PATH(TCL_INCLUDE_PATH tcl.h
+ ${TCLTK_POSSIBLE_INCLUDE_PATHS}
)
FIND_PATH(TK_INCLUDE_PATH tk.h
- ${TK_FRAMEWORK_INCLUDES} ${TCLTK_POSSIBLE_INCLUDE_PATHS}
+ ${TCLTK_POSSIBLE_INCLUDE_PATHS} NO_DEFAULT_PATH
+)
+FIND_PATH(TK_INCLUDE_PATH tk.h
+ ${TCLTK_POSSIBLE_INCLUDE_PATHS}
)
# handle the QUIETLY and REQUIRED arguments and set TCL_FOUND to TRUE if