Changeset 1776 for code/trunk/cmake/FindTCL.cmake

Timestamp:

Sep 13, 2008, 9:32:44 PM (16 years ago)

Author:

landauf

Message:

Many changes in almost all FindXYZ.cmake files. They now throw errors if something wasn't found.

File:

• code/trunk/cmake/FindTCL.cmake (modified) (6 diffs)

code/trunk/cmake/FindTCL.cmake

@@ -5 +5 @@
 #  TCL_LIBRARY        = path to Tcl library (tcl tcl80)
 #  TCL_LIBRARY_DEBUG  = path to Tcl library (debug)
-#  TCL_STUB_LIBRARY   = path to Tcl stub library
-#  TCL_STUB_LIBRARY_DEBUG = path to debug stub library
 #  TCL_INCLUDE_PATH   = path to where tcl.h can be found
-#  TCL_TCLSH          = path to tclsh binary (tcl tcl80)
-#  TK_LIBRARY         = path to Tk library (tk tk80 etc)
-#  TK_LIBRARY_DEBUG   = path to Tk library (debug)
-#  TK_STUB_LIBRARY    = path to Tk stub library
-#  TK_STUB_LIBRARY_DEBUG = path to debug Tk stub library
-#  TK_INCLUDE_PATH    = path to where tk.h can be found
-#  TK_INTERNAL_PATH   = path to where tkWinInt.h is found
-#  TK_WISH            = full path to the wish executable
+#
+# Several changes and additions by Fabian 'x3n' Landau
+#                 > www.orxonox.net <
 
-INCLUDE(CMakeFindFrameworks)
-INCLUDE(FindTclsh)
-INCLUDE(FindWish)
-
-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
-GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH)
+IF (TCL_LIBRARY AND TCL_INCLUDE_PATH)
+  SET(TCL_FIND_QUIETLY TRUE)
+ENDIF (TCL_LIBRARY AND TCL_INCLUDE_PATH)
 
 SET (TCLTK_POSSIBLE_LIB_PATHS
@@ -32 +22 @@
   "C:/Program Files/Tcl/lib" 
   "C:/Tcl/lib" 
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/lib
-  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/lib
-  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib
-  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib
   /usr/lib 
   /usr/local/lib
@@ -45 +33 @@
 
 FIND_LIBRARY(TCL_LIBRARY
-  NAMES tcl tcl85 tcl8.5 tcl84 tcl8.4 tcl83 tcl8.3 tcl82 tcl8.2 tcl80 tcl8.0
+  NAMES tcl tcl85 tcl8.5 tcl84 tcl8.4
   PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
 )
 
 FIND_LIBRARY(TCL_LIBRARY_DEBUG
-  NAMES tcld tcl85d tcl8.5d tcl84d tcl8.4d tcl83d tcl8.3d tcl82d tcl8.2d tcl80d tcl8.0d
+  NAMES tcld tcl85d tcl8.5d tcl84d tcl8.4d
   PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
 )
-
-FIND_LIBRARY(TCL_STUB_LIBRARY
-  NAMES tclstub tclstub84 tclstub8.4 tclstub83 tclstub8.3 tclstub82 tclstub8.2 tclstub80 tclstub8.0
-  PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-)
-
-FIND_LIBRARY(TCL_STUB_LIBRARY_DEBUG
-  NAMES tclstubd tclstub84d tclstub8.4d tclstub83d tclstub8.3d tclstub82d tclstub8.2d tclstub80d tclstub8.0d
-  PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-)
-
-FIND_LIBRARY(TK_LIBRARY 
-  NAMES tk tk84 tk8.4 tk83 tk8.3 tk82 tk8.2 tk80 tk8.0
-  PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-)
-
-FIND_LIBRARY(TK_LIBRARY_DEBUG
-  NAMES tkd tk84d tk8.4d tk83d tk8.3d tk82d tk8.2d tk80d tk8.0d
-  PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-)
-
-FIND_LIBRARY(TK_STUB_LIBRARY 
-  NAMES tkstub tkstub84 tkstub8.4 tkstub83 tkstub8.3 tkstub82 tkstub8.2 tkstub80 tkstub8.0
-  PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-)
-
-FIND_LIBRARY(TK_STUB_LIBRARY_DEBUG
-  NAMES tkstubd tkstub84d tkstub8.4d tkstub83d tkstub8.3d tkstub82d tkstub8.2d tkstub80d tkstub8.0d
-  PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-)
-
-CMAKE_FIND_FRAMEWORKS(Tcl)
-CMAKE_FIND_FRAMEWORKS(Tk)
-
-SET(TCL_FRAMEWORK_INCLUDES)
-IF(Tcl_FRAMEWORKS)
-  IF(NOT TCL_INCLUDE_PATH)
-    FOREACH(dir ${Tcl_FRAMEWORKS})
-      SET(TCL_FRAMEWORK_INCLUDES ${TCL_FRAMEWORK_INCLUDES} ${dir}/Headers)
-    ENDFOREACH(dir)
-  ENDIF(NOT TCL_INCLUDE_PATH)
-ENDIF(Tcl_FRAMEWORKS)
-
-SET(TK_FRAMEWORK_INCLUDES)
-IF(Tk_FRAMEWORKS)
-  IF(NOT TK_INCLUDE_PATH)
-    FOREACH(dir ${Tk_FRAMEWORKS})
-      SET(TK_FRAMEWORK_INCLUDES ${TK_FRAMEWORK_INCLUDES}
-        ${dir}/Headers ${dir}/PrivateHeaders)
-    ENDFOREACH(dir)
-  ENDIF(NOT TK_INCLUDE_PATH)
-ENDIF(Tk_FRAMEWORKS)
-
-GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
-GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
 
 SET (TCLTK_POSSIBLE_INCLUDE_PATHS
@@ -114 +47 @@
   "${TCL_LIBRARY_PATH}/../include"
   "${TK_LIBRARY_PATH}/../include"
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/include
-  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/include
-  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/include
-  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/include
   "$ENV{ProgramFiles}/Tcl/include"
   "C:/Program Files/Tcl/include"
@@ -123 +54 @@
   /usr/include
   /usr/local/include
+  /usr/include/tcl8.5
   /usr/include/tcl8.4
-  /usr/include/tcl8.3
-  /usr/include/tcl8.2
-  /usr/include/tcl8.0
   ../libs/tcl8.5.2/generic
 )
@@ -134 +63 @@
 )
 
-FIND_PATH(TK_INCLUDE_PATH tk.h
-  ${TK_FRAMEWORK_INCLUDES} ${TCLTK_POSSIBLE_INCLUDE_PATHS}
-)
 
-IF (WIN32)
-  FIND_PATH(TK_INTERNAL_PATH tkWinInt.h
-    ${TCLTK_POSSIBLE_INCLUDE_PATHS}
-  )
-  MARK_AS_ADVANCED(TK_INTERNAL_PATH)
-ENDIF(WIN32)
-
-MARK_AS_ADVANCED(
-    TCL_TCLSH_PATH
-    TK_WISH_PATH
-    TCL_INCLUDE_PATH
-    TK_INCLUDE_PATH
-    TCL_LIBRARY
-    TCL_LIBRARY_DEBUG
-    TK_LIBRARY  
-    TK_LIBRARY_DEBUG
-  TCL_STUB_LIBRARY
-  TCL_STUB_LIBRARY_DEBUG
-  TK_STUB_LIBRARY  
-  TK_STUB_LIBRARY
-  TK_STUB_LIBRARY_DEBUG
-  )
+IF (TCL_LIBRARY AND TCL_INCLUDE_PATH)
+  IF (NOT TCL_FIND_QUIETLY)
+    MESSAGE(STATUS "Tcl was found")
+    IF (VERBOSE_FIND)
+      MESSAGE (STATUS "  include path: ${TCL_INCLUDE_PATH}")
+      MESSAGE (STATUS "  library path: ${TCL_LIBRARY}")
+      MESSAGE (STATUS "  libraries:    tcld tcl85d tcl8.5d tcl84d tcl8.4d")
+    ENDIF (VERBOSE_FIND)
+  ENDIF (NOT TCL_FIND_QUIETLY)
+ELSE (TCL_LIBRARY AND TCL_INCLUDE_PATH)
+  IF (NOT TCL_INCLUDE_PATH)
+    MESSAGE(SEND_ERROR "Tcl include path was not found.")
+  ENDIF (NOT TCL_INCLUDE_PATH)
+  IF (NOT TCL_LIBRARY )
+    MESSAGE(SEND_ERROR "Tcl library was not found.")
+  ENDIF (NOT TCL_LIBRARY )
+ENDIF (TCL_LIBRARY AND TCL_INCLUDE_PATH)
 
 IF(TCL_INCLUDE_PATH)
-  IF(TK_INCLUDE_PATH)
-    IF(TCL_LIBRARY)
-      IF(TK_LIBRARY)
-        SET(TCL_FOUND 1)
-      ENDIF(TK_LIBRARY)
-    ENDIF(TCL_LIBRARY)
-  ENDIF(TK_INCLUDE_PATH)
+  IF(TCL_LIBRARY)
+    SET(TCL_FOUND 1)
+  ENDIF(TCL_LIBRARY)
 ENDIF(TCL_INCLUDE_PATH)