Revision: 75578
http://sourceforge.net/p/brlcad/code/75578
Author: starseeker
Date: 2020-04-23 18:01:38 +0000 (Thu, 23 Apr 2020)
Log Message:
-----------
At least on Linux, we're not getting a stray inclustion of the local X.h and
friends... an experiment forcing them into the include path resulted in an
immediately crashing MGED, rather than a crash occurring with the embedded
framebuffer.
Modified Paths:
--------------
brlcad/trunk/src/other/tk/CMakeLists.txt
Modified: brlcad/trunk/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tk/CMakeLists.txt 2020-04-23 17:49:44 UTC (rev
75577)
+++ brlcad/trunk/src/other/tk/CMakeLists.txt 2020-04-23 18:01:38 UTC (rev
75578)
@@ -678,6 +678,8 @@
add_definitions(-DXKEYCODETOKEYSYM_IS_DEPRECATED=1)
include_directories(
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
${TK_X11_INCLUDE_DIRS}
)
if (TK_ENABLE_XFT)
@@ -684,11 +686,6 @@
include_directories(${FREETYPE_INCLUDE_DIRS})
endif (TK_ENABLE_XFT)
-include_directories(
- ${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
- )
-
set(X11_TK_LIBS ${X11_X11_LIB} ${X11_Xext_LIB})
if (TK_ENABLE_XSS AND X11_Xscreensaver_LIB)
set(X11_TK_LIBS ${X11_TK_LIBS} ${X11_Xscreensaver_LIB})
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
