--- cmake-3.11.4.old/Modules/FindTCL.cmake +++ cmake-3.11.4/Modules/FindTCL.cmake @@ -76,6 +76,7 @@ "^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}") set(TCLTK_POSSIBLE_LIB_PATHS + __META_PRODTREE__/tcltk/lib "${TCL_INCLUDE_PATH_PARENT}/lib" "${TK_INCLUDE_PATH_PARENT}/lib" "${TCL_LIBRARY_PATH}" @@ -122,8 +123,9 @@ tcl83 tcl8.3 tcl82 tcl8.2 tcl80 tcl8.0 - PATHS ${TCLTK_POSSIBLE_LIB_PATHS} + PATHS __META_PRODTREE__/tcltk/lib + ${TCLTK_POSSIBLE_LIB_PATHS} PATH_SUFFIXES ${TCLTK_POSSIBLE_LIB_PATH_SUFFIXES} ) find_library(TK_LIBRARY @@ -136,8 +138,9 @@ tk83 tk8.3 tk82 tk8.2 tk80 tk8.0 - PATHS ${TCLTK_POSSIBLE_LIB_PATHS} + PATHS __META_PRODTREE__/tcltk/lib + ${TCLTK_POSSIBLE_LIB_PATHS} PATH_SUFFIXES ${TCLTK_POSSIBLE_LIB_PATH_SUFFIXES} ) CMAKE_FIND_FRAMEWORKS(Tcl) @@ -163,6 +166,7 @@ endif() set(TCLTK_POSSIBLE_INCLUDE_PATHS + __META_PRODTREE__/tcltk/include "${TCL_LIBRARY_PATH_PARENT}/include" "${TK_LIBRARY_PATH_PARENT}/include" "${TCL_INCLUDE_PATH}"