Revision: 75597
http://sourceforge.net/p/brlcad/code/75597
Author: starseeker
Date: 2020-04-23 23:26:14 +0000 (Thu, 23 Apr 2020)
Log Message:
-----------
Grr. A quick check doesn't find any way to package require Tk without the
graphics window initialization, which precludes getting tk windowingsystem to
reliably return in headless configuration. Only an issue on OSX at the moment,
and will not be an issue there if we shift to cross-platform DM/FB backends...
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 23:14:14 UTC (rev
75596)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-04-23 23:26:14 UTC (rev
75597)
@@ -466,29 +466,6 @@
endif (NOT WIN32)
set(TK_SYSTEM_GRAPHICS "${TK_SYSTEM_GRAPHICS}" CACHE STRING "Tk system
graphics type" FORCE)
- if (0)
- # Now we know what the options want - confirm we actually have it. If not,
it's a fatal
- # error - the user will need to either specify a system version with the
graphics system
- # desired, change their toplevel options, or enable the bundled Tcl/Tk build.
- set(tkwin_script "
-package require Tk
-set filename \"${CMAKE_BINARY_DIR}/CMakeTmp/TK_WINDOWINGSYSTEM\"
-set fileId [open $filename \"w\"]
-set windowingsystem [tk windowingsystem]
-puts $fileId $windowingsystem
-close $fileId
-exit
- ")
- set(tkwin_scriptfile "${CMAKE_BINARY_DIR}/CMakeTmp/tk_windowingsystem.tcl")
- file(WRITE ${tkwin_scriptfile} ${tkwin_script})
- execute_process(COMMAND ${TCL_TCLSH} ${tkwin_scriptfile} OUTPUT_VARIABLE
EXECOUTPUT)
- file(READ "${CMAKE_BINARY_DIR}/CMakeTmp/TK_WINDOWINGSYSTEM" tcl_tkwin_raw)
- string(REGEX REPLACE "\n" "" tcl_tkwin ${tcl_tkwin_raw})
- if (NOT "${TK_SYSTEM_GRAPHICS}" MATCHES "${tcl_tkwin}")
- message(FATAL_ERROR "Grahics system needed is ${TK_SYSTEM_GRAPHICS} but
found Tcl/Tk reports \"${tcl_tkwin}\". Need to either specify a Tcl/Tk system
with the desired graphics behavior or specifiy different toplevel graphics
options.")
- endif (NOT "${TK_SYSTEM_GRAPHICS}" MATCHES "${tcl_tkwin}")
- endif (0)
-
endif(BRLCAD_TK_BUILD)
mark_as_advanced(TK_INCLUDE_PATH)
mark_as_advanced(TK_LIBRARY)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
