From ed80150dd789436d3fe399278258c65fdc0cd0a1 Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Fri, 29 Oct 2021 20:17:03 +0200 Subject: [PATCH] hard-code path to (self-compiled) tcl/tk stub libs on macos --- cmake/external_projects/tcltk.cmake | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/cmake/external_projects/tcltk.cmake b/cmake/external_projects/tcltk.cmake index 106defb2..6eb445ec 100644 --- a/cmake/external_projects/tcltk.cmake +++ b/cmake/external_projects/tcltk.cmake @@ -114,21 +114,8 @@ if(APPLE) set(TK_LIBRARY ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tk.framework) set(TK_INCLUDE_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tk.framework/Headers) - set(tcl_find_args - REQUIRED - NO_DEFAULT_PATH - NO_PACKAGE_ROOT_PATH - NO_CMAKE_PATH - NO_CMAKE_ENVIRONMENT_PATH - NO_SYSTEM_ENVIRONMENT_PATH - NO_CMAKE_SYSTEM_PATH - NO_CMAKE_FIND_ROOT_PATH - HINTS - ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tcl.framework - ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tk.framework - ) - find_library(TCL_STUB_LIBRARY NAMES tclstub85 tclstub8.5 tclstub86 tclstub8.6 ${tcl_find_args}) - find_library(TK_STUB_LIBRARY NAMES tkstub85 tkstub8.5 tkstub86 tkstub8.6 ${tcl_find_args}) + set(TCL_STUB_LIBRARY ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tcl.framework/tclstub8.6.a) + set(TK_STUB_LIBRARY ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tk.framework/tkstub8.6.a) # # use system tcl/tk # if((${PYTHON_VERSION_STRING} VERSION_EQUAL "3.7") OR (${PYTHON_VERSION_STRING} VERSION_GREATER "3.7"))