diff options
| -rw-r--r-- | Modules/FindTCL.cmake | 6 | ||||
| -rw-r--r-- | Modules/FindTclsh.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindWish.cmake | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake index 9a73d40..47ce849 100644 --- a/Modules/FindTCL.cmake +++ b/Modules/FindTCL.cmake @@ -32,7 +32,10 @@ GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH) GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH) GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH) +GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH) GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH) + +GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH) GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH) GET_FILENAME_COMPONENT( @@ -168,9 +171,6 @@ IF(Tk_FRAMEWORKS) 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 ${TCL_TCLSH_PATH_PARENT}/include ${TK_WISH_PATH_PARENT}/include diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake index aaed8dd..8cb3a76 100644 --- a/Modules/FindTclsh.cmake +++ b/Modules/FindTclsh.cmake @@ -15,9 +15,9 @@ GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH) GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH) GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH) -GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH) - GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH) + +GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH) GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH) GET_FILENAME_COMPONENT( diff --git a/Modules/FindWish.cmake b/Modules/FindWish.cmake index d678b8f..4e365cf 100644 --- a/Modules/FindWish.cmake +++ b/Modules/FindWish.cmake @@ -14,9 +14,9 @@ GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH) GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH) GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH) -GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH) - GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH) + +GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH) GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH) GET_FILENAME_COMPONENT( |