[brlcad-commits] SF.net SVN: brlcad:[55719] brlcad/trunk
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[brlcad-commits] SF.net SVN: brlcad:[55719] brlcad/trunk
|
From: <eri...@us...> - 2013-06-12 14:42:29
|
Revision: 55719
http://sourceforge.net/p/brlcad/code/55719
Author: erikgreenwald
Date: 2013-06-12 14:42:26 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
remove togl
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/INSTALL
brlcad/trunk/TODO
brlcad/trunk/configure.cmake.sh
brlcad/trunk/src/other/CMakeLists.txt
brlcad/trunk/src/other/Makefile.am
brlcad/trunk/src/other/README
Removed Paths:
-------------
brlcad/trunk/src/other/togl/
brlcad/trunk/src/other/togl.dist
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2013-06-12 14:33:04 UTC (rev 55718)
+++ brlcad/trunk/CMakeLists.txt 2013-06-12 14:42:26 UTC (rev 55719)
@@ -994,7 +994,7 @@
endif(NOT BRLCAD_BUNDLED_LIBS MATCHES "AUTO" AND NOT BRLCAD_BUNDLED_LIBS MATCHES "BUNDLED" AND NOT BRLCAD_BUNDLED_LIBS MATCHES "SYSTEM")
# Enable Aqua widgets on Mac OSX. This impacts Tcl/Tk building and OpenGL
-# building. Not currently working - needs work in at least Tk and togl
+# building. Not currently working - needs work in at least Tk
# CMake logic (probably more), and the display manager/framebuffer codes are known to depend
# on either GLX or WGL specifically in their current forms.
option(BRLCAD_ENABLE_AQUA "Use Aqua instead of X11 whenever possible on OSX." OFF)
Modified: brlcad/trunk/INSTALL
===================================================================
--- brlcad/trunk/INSTALL 2013-06-12 14:33:04 UTC (rev 55718)
+++ brlcad/trunk/INSTALL 2013-06-12 14:42:26 UTC (rev 55719)
@@ -577,19 +577,6 @@
Aliases: ENABLE_ITK
---- BRLCAD_TOGL ---
-
-Option for enabling and disabling compilation of the Togl package for
-Tcl/Tk OpenGL support provided with BRL-CAD's source distribution.
-Default is AUTO, auto-enabling if the BRLCAD_TCL option is set to
-BUNDLED and testing first for a system version if BRLCAD_TCL is set to
-AUTO or SYSTEM. If BRLCAD_TOGL is set to BUNDLED, local copy is built
-even if a system version is present. This package will be disabled if
-either BRLCAD_ENABLE_OPENGL or BRLCAD_ENABLE_TK are OFF.
-
-Aliases: ENABLE_TOGL
-
-
--- BRLCAD_IWIDGETS ---
Option for enabling and disabling compilation of the IWidgets Tk
Modified: brlcad/trunk/TODO
===================================================================
--- brlcad/trunk/TODO 2013-06-12 14:33:04 UTC (rev 55718)
+++ brlcad/trunk/TODO 2013-06-12 14:42:26 UTC (rev 55719)
@@ -28,8 +28,6 @@
* closing the graphics window brings down X11 on Mac due to a bad
context. fix or revert recent close window behavior.
-* Investigate replacing togl for adrt/isst
-
* Rework p2t so it doesn't take down the application
when a NURBS tessellation fails - should just abandon the
problem input and continue.
Modified: brlcad/trunk/configure.cmake.sh
===================================================================
--- brlcad/trunk/configure.cmake.sh 2013-06-12 14:33:04 UTC (rev 55718)
+++ brlcad/trunk/configure.cmake.sh 2013-06-12 14:42:26 UTC (rev 55719)
@@ -138,10 +138,6 @@
shift;;
--disable-itk) options="$options -DBRLCAD_ITK=SYSTEM";
shift;;
- --enable-togl) options="$options -DBRLCAD_TOGL=BUNDLED";
- shift;;
- --disable-togl) options="$options -DBRLCAD_TOGL=SYSTEM";
- shift;;
--enable-iwidgets) options="$options -DBRLCAD_IWIDGETS=BUNDLED";
shift;;
--disable-iwidgets) options="$options -DBRLCAD_IWIDGETS=SYSTEM";
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2013-06-12 14:33:04 UTC (rev 55718)
+++ brlcad/trunk/src/other/CMakeLists.txt 2013-06-12 14:42:26 UTC (rev 55719)
@@ -678,40 +678,6 @@
mark_as_advanced(ITK_VERSION)
mark_as_advanced(ITK_LIBRARY)
-# For now only turn on Togl for X11, but will need it everywhere
-# eventually. Will need some logic to both look for package require
-# and the C library, as both APIs will be needed.
-
-set(togl_ALIASES ENABLE_TOGL)
-set(togl_DESCRIPTION "
-Option for enabling and disabling compilation of the Togl package for
-Tcl/Tk OpenGL support provided with BRL-CAD's source distribution.
-Default is AUTO, auto-enabling if the BRLCAD_TCL option is set to
-BUNDLED and testing first for a system version if BRLCAD_TCL is set to
-AUTO or SYSTEM. If BRLCAD_TOGL is set to BUNDLED, local copy is built
-even if a system version is present. This package will be disabled if
-either BRLCAD_ENABLE_OPENGL or BRLCAD_ENABLE_TK are OFF.
-")
-THIRD_PARTY_TCL_PACKAGE(Togl togl "${TCL_WISH_EXECUTABLE}" "tcl;tk" "BRLCAD_ENABLE_TK;BRLCAD_ENABLE_OPENGL;BRLCAD_ENABLE_X11;BRLCAD_LEVEL3" "togl" togl_ALIASES togl_DESCRIPTION)
-if(BRLCAD_TOGL_BUILD)
- set(TOGL_LIBRARIES togl CACHE STRING "TOGL_LIBRARIES" FORCE)
- set(TOGL_STUB_LIBRARIES toglstub CACHE STRING "TOGL_STUB_LIBRARIES" FORCE)
- set(TOGL_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/togl/include;${CMAKE_CURRENT_SOURCE_DIR}/togl/include" CACHE STRING "Togl include path" FORCE)
- DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/togl/pkgIndex.tcl
- ${CMAKE_CURRENT_BINARY_DIR}/togl/src/pkgIndex.tcl)
- DISTCLEAN(${CMAKE_BINARY_DIR}/lib/Togl2.1)
-ELSE(BRLCAD_TOGL_BUILD)
- # No Togl enabled - fix this so a system one has a chance...
- #set(TOGL_LIBRARIES "" CACHE STRING "Tcl/Tk OpenGL disabled" FORCE)
- #set(TOGL_STUB_LIBRARIES "" CACHE STRING "Tcl/Tk OpenGL disabled" FORCE)
- #set(TOGL_INCLUDE_DIRS "" CACHE STRING "Tcl/Tk OpenGL disabled" FORCE)
- set(TOGL_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/togl/include;${CMAKE_CURRENT_SOURCE_DIR}/togl/include" CACHE STRING "Togl include path" FORCE)
-endif(BRLCAD_TOGL_BUILD)
-mark_as_advanced(TOGL_LIBRARY)
-mark_as_advanced(TOGL_LIBRARIES)
-mark_as_advanced(TOGL_STUB_LIBRARIES)
-mark_as_advanced(TOGL_INCLUDE_DIRS)
-
set(iwidgets_ALIASES ENABLE_IWIDGETS)
set(iwidgets_DESCRIPTION "
Option for enabling and disabling compilation of the IWidgets Tk
Modified: brlcad/trunk/src/other/Makefile.am
===================================================================
--- brlcad/trunk/src/other/Makefile.am 2013-06-12 14:33:04 UTC (rev 55718)
+++ brlcad/trunk/src/other/Makefile.am 2013-06-12 14:42:26 UTC (rev 55719)
@@ -65,16 +65,6 @@
TKHTMLDIR=
endif
-#if BUILD_TOGL
-#if WITH_TK
-#TOGLDIR=togl
-#else
-#TOGLDIR=
-#endif
-#else
-#TOGLDIR=
-#endif
-
if BUILD_TKPNG
if WITH_TK
TKPNGDIR=tkpng
@@ -166,7 +156,6 @@
README \
boost \
clipper \
- togl \
hv3 \
Eigen \
CMakeLists.txt \
@@ -209,7 +198,6 @@
tkhtml.dist \
tkpng.dist \
tktable.dist \
- togl.dist \
URToolkit.dist \
libvds.dist \
poly2tri.dist \
Modified: brlcad/trunk/src/other/README
===================================================================
--- brlcad/trunk/src/other/README 2013-06-12 14:33:04 UTC (rev 55718)
+++ brlcad/trunk/src/other/README 2013-06-12 14:42:26 UTC (rev 55719)
@@ -55,7 +55,6 @@
tkhtml fork of http://tkhtml.tcl.tk/tkhtml.html Used by MGED and Archer help systems now, and by hv3 once it is up and running.
tkpng http://www.muonics.com/FreeStuff/TkPNG/ PNG photo image support for Tk - used by Archer
tktable http://tktable.sourceforge.net/ High performing table widget for Tcl/Tk, used by Archer
-togl fork of http://togl.sourceforge.net/ Tk OpenGL widget, used by ISST
6. Misc
osl
Deleted: brlcad/trunk/src/other/togl.dist
===================================================================
--- brlcad/trunk/src/other/togl.dist 2013-06-12 14:33:04 UTC (rev 55718)
+++ brlcad/trunk/src/other/togl.dist 2013-06-12 14:42:26 UTC (rev 55719)
@@ -1,36 +0,0 @@
-SET(togl_ignore_files
-CMake
-LICENSE
-README
-configure
-configure.in
-doc
-include
-tools
-src/Togl.py
-src/Xmu/README
-src/Xmu/README.togl
-src/Xmu/StdCmap.h
-src/togl.decls
-src/toglAGL.c
-src/toglGLX.c
-src/toglNSOpenGL.c
-src/toglWGL.c
-demo/ben.rgb
-demo/double.c
-demo/double.tcl
-demo/gears.tcl
-demo/image.h
-demo/index.c
-demo/index.tcl
-demo/multisample.tcl
-demo/overlay.c
-demo/overlay.tcl
-demo/pbuffer.c
-demo/pbuffer.tcl
-demo/stereo.c
-demo/stereo.tcl
-demo/texture.c
-demo/texture.tcl
-demo/tree2.rgba
-)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|