Merge branch 'main' into RELEASE

BRL-CAD · Sep 20, 2024 · ba294f7 · ba294f7
2 parents d7ddb27 + 5df71de
commit ba294f7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tk/CMakeLists.txt b/tk/CMakeLists.txt
@@ -6,9 +6,12 @@ if (USE_BRLCAD)
   # Decide if we're using Tk
   cad_enable(TK "archer;mged;bwish;rtwizard;brlman")
 
-  if (DISABLE_TK)
+  if (NOT TK_LIBRARY OR TARGET TCL_BLD)
+    set(TK_DO_BUILD 1)
+  endif (NOT TK_LIBRARY OR TARGET TCL_BLD)
+  if (DISABLE_TCL OR DISABLE_TK)
     set(TK_DO_BUILD 0)
-  endif (DISABLE_TK)
+  endif (DISABLE_TCL OR DISABLE_TK)
 
 else (USE_BRLCAD)