find_package tcl again

This commit is contained in:
James Cherry 2020-01-07 17:08:53 -08:00
parent b28d9c9acc
commit aba32d652f
1 changed files with 8 additions and 7 deletions

View File

@ -508,13 +508,14 @@ add_custom_command(OUTPUT ${STA_TCL_INIT}
#
################################################################
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
# OSX tcl is deprecated and prints a warning, so look for a user installed
# version before using the system version.
include(FindTcl)
else()
find_package(TCL REQUIRED)
endif()
# OSX tcl is deprecated and prints a warning, so look for a user installed
# version before using the system version.
# I tried to override the library search order instead but failed.
# CMAKE_FIND_FRAMEWORK LAST bypasses the version in the framework directory
# but not the one in /usr/lib.
# This calls cmake/FindTCL.cmake
# Do not use REQUIRED because it also requires TK.
find_package(TCL)
# Zlib
include(FindZLIB)