Revision: 75902
http://sourceforge.net/p/brlcad/code/75902
Author: starseeker
Date: 2020-05-23 21:39:24 +0000 (Sat, 23 May 2020)
Log Message:
-----------
Set the graphics system up front, ahead of any Tcl related find_package calls.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-05-23 21:08:17 UTC (rev
75901)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-05-23 21:39:24 UTC (rev
75902)
@@ -308,6 +308,17 @@
# Tcl/Tk and related extensions
####################################################################
+# Set the expected graphics system (if known) before any find_package
+# calls related to Tcl
+if(BRLCAD_ENABLE_AQUA)
+ set(TK_ENABLE_AQUA ON CACHE STRING "BRL-CAD setting to enable AQUA" FORCE)
+ set(TK_SYSTEM_GRAPHICS "aqua" CACHE STRING "Tk system graphics type" FORCE)
+else(BRLCAD_ENABLE_AQUA)
+ if (BRLCAD_ENABLE_X11)
+ set(TK_SYSTEM_GRAPHICS "x11" CACHE STRING "Tk system graphics type" FORCE)
+ endif (BRLCAD_ENABLE_X11)
+endif(BRLCAD_ENABLE_AQUA)
+
# Make sure we actually look for these each time...
unset(TCL_TCLSH CACHE)
unset(TCL_LIBRARY CACHE)
@@ -411,14 +422,6 @@
local copy is built even if a system version is present. This option
also depends on BRLCAD_ENABLE_TK being ON.
")
-if(BRLCAD_ENABLE_AQUA)
- set(TK_ENABLE_AQUA ON CACHE STRING "BRL-CAD setting to enable AQUA" FORCE)
- set(TK_SYSTEM_GRAPHICS "aqua" CACHE STRING "Tk system graphics type" FORCE)
-else(BRLCAD_ENABLE_AQUA)
- if (BRLCAD_ENABLE_X11)
- set(TK_SYSTEM_GRAPHICS "x11" CACHE STRING "Tk system graphics type" FORCE)
- endif (BRLCAD_ENABLE_X11)
-endif(BRLCAD_ENABLE_AQUA)
THIRD_PARTY_TCL_PACKAGE(Tk tk "${TCL_TCLSH}" "tcl"
"BRLCAD_ENABLE_TK;BRLCAD_LEVEL2" "tk" tk_ALIASES tk_DESCRIPTION)
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
