Revision: 75272
http://sourceforge.net/p/brlcad/code/75272
Author: starseeker
Date: 2020-04-06 15:16:57 +0000 (Mon, 06 Apr 2020)
Log Message:
-----------
Ah, right - don't do XFT in Tk unless we're doing fontconfig experimentation.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2020-04-06 15:05:36 UTC (rev
75271)
+++ brlcad/trunk/src/other/CMakeLists.txt 2020-04-06 15:16:57 UTC (rev
75272)
@@ -465,6 +465,10 @@
if(BRLCAD_ENABLE_AQUA)
set(TK_ENABLE_AQUA ON CACHE STRING "BRL-CAD setting to enable AQUA" FORCE)
endif(BRLCAD_ENABLE_AQUA)
+if (NOT TEST_FONTCONFIG AND BRLCAD_PNG_BUILD)
+ set(TK_DISABLE_XFT 1 CACHE STRING "Disable due to building local libpng"
FORCE)
+ mark_as_advanced(TK_DISABLE_XFT)
+endif (NOT TEST_FONTCONFIG AND BRLCAD_PNG_BUILD)
THIRD_PARTY_TCL_PACKAGE(Tk tk "${TCL_TCLSH}" "tcl"
"BRLCAD_ENABLE_TK;BRLCAD_LEVEL2" "tk" tk_ALIASES tk_DESCRIPTION)
if(BRLCAD_TK_BUILD)
SetTargetFolder(wish "Third Party Executables")
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
