Revision: 54917
http://brlcad.svn.sourceforge.net/brlcad/?rev=54917&view=rev
Author: starseeker
Date: 2013-03-27 16:30:10 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
revert 54916
Modified Paths:
--------------
brlcad/trunk/INSTALL
brlcad/trunk/configure.cmake.sh
brlcad/trunk/src/other/CMakeLists.txt
Removed Paths:
-------------
brlcad/trunk/src/other/tkdnd/
brlcad/trunk/src/other/tkdnd.dist
brlcad/trunk/src/other/tktreectrl/
brlcad/trunk/src/other/tktreectrl.dist
Modified: brlcad/trunk/INSTALL
===================================================================
--- brlcad/trunk/INSTALL 2013-03-27 16:28:31 UTC (rev 54916)
+++ brlcad/trunk/INSTALL 2013-03-27 16:30:10 UTC (rev 54917)
@@ -642,32 +642,6 @@
Aliases: ENABLE_TKTABLE
---- BRLCAD_TKTREECTRL ---
-
-Option for enabling and disabling compilation of the TkTreeCtrl graphical
-table widget package 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_TKTREECTRL is set to BUNDLED, local copy is built
-even if a system version is present. This package will be disabled if
-BRLCAD_ENABLE_TK is OFF.
-
-Aliases: ENABLE_TKTREECTRL
-
-
---- BRLCAD_TKDND ---
-
-Option for enabling and disabling compilation of the TkDnD
-drag-and-drop widget 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_TKDND is set to BUNDLED, local copy is built
-even if a system version is present. This package will be disabled if
-BRLCAD_ENABLE_TK is OFF.
-
-Aliases: ENABLE_TKDND
-
-
--- BRLCAD_OPENNURBS ---
Option for enabling and disabling compilation of the openNURBS library
Modified: brlcad/trunk/configure.cmake.sh
===================================================================
--- brlcad/trunk/configure.cmake.sh 2013-03-27 16:28:31 UTC (rev 54916)
+++ brlcad/trunk/configure.cmake.sh 2013-03-27 16:30:10 UTC (rev 54917)
@@ -158,14 +158,6 @@
shift;;
--disable-tktable) options="$options
-DBRLCAD_TKTABLE=SYSTEM";
shift;;
- --enable-tktreectrl) options="$options
-DBRLCAD_TKTREECTRL=BUNDLED";
- shift;;
- --disable-tktreectrl) options="$options
-DBRLCAD_TKTREECTRL=SYSTEM";
- shift;;
- --enable-tkdnd) options="$options -DBRLCAD_TKDND=BUNDLED";
- shift;;
- --disable-tkdnd) options="$options -DBRLCAD_TKDND=SYSTEM";
- shift;;
--enable-opennurbs) options="$options
-DBRLCAD_OPENNURBS=BUNDLED";
shift;;
--disable-opennurbs) options="$options
-DBRLCAD_OPENNURBS=SYSTEM";
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2013-03-27 16:28:31 UTC (rev
54916)
+++ brlcad/trunk/src/other/CMakeLists.txt 2013-03-27 16:30:10 UTC (rev
54917)
@@ -776,37 +776,22 @@
DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/tktable/tktable_cfg.h)
DISTCLEAN(${CMAKE_BINARY_DIR}/lib/Tktable2.10)
-set(tktreectrl_ALIASES ENABLE_TKTREECTRL)
-set(tktreectrl_DESCRIPTION "
-Option for enabling and disabling compilation of the TkTreeCtrl graphical
-table widget package 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_TKTREECTRL is set to BUNDLED, local copy is built
-even if a system version is present. This package will be disabled if
-BRLCAD_ENABLE_TK is OFF.
-")
-THIRD_PARTY_TCL_PACKAGE(tktreectrl tktreectrl "${TCL_WISH_EXECUTABLE}" "tcl;tk"
- "BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" tktreectrl_ALIASES
tktreectrl_DESCRIPTION)
-DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/tktreectrl/pkgIndex.tcl)
-DISTCLEAN(${CMAKE_BINARY_DIR}/lib/TkTreeCtrl2.4)
+#set(tktreectrl_ALIASES ENABLE_TKTREECTRL)
+#set(tktreectrl_DESCRIPTION "
+#Option for enabling and disabling compilation of the TkTreeCtrl graphical
+#table widget package 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_TKTREECTRL is set to BUNDLED, local copy is built
+#even if a system version is present. This package will be disabled if
+#BRLCAD_ENABLE_TK is OFF.
+#")
+#THIRD_PARTY_TCL_PACKAGE(tktreectrl tktreectrl "${TCL_WISH_EXECUTABLE}"
"tcl;tk"
+# "BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" tktreectrl_ALIASES
tktreectrl_DESCRIPTION)
+#DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/tktreectrl/pkgIndex.tcl)
+#DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/tktreectrl/tktreectrl_cfg.h)
+#DISTCLEAN(${CMAKE_BINARY_DIR}/lib/TkTreeCtrl2.4)
-set(tkdnd_ALIASES ENABLE_TKDND)
-set(tkdnd_DESCRIPTION "
-Option for enabling and disabling compilation of the TkDnD
-drag-and-drop widget 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_TKDND is set to BUNDLED, local copy is built
-even if a system version is present. This package will be disabled if
-BRLCAD_ENABLE_TK is OFF.
-")
-THIRD_PARTY_TCL_PACKAGE(tkdnd tkdnd "${TCL_WISH_EXECUTABLE}" "tcl;tk"
- "BRLCAD_ENABLE_TK;BRLCAD_LEVEL3" "" tkdnd_ALIASES tkdnd_DESCRIPTION)
-DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/tkdnd/pkgIndex.tcl)
-DISTCLEAN(${CMAKE_BINARY_DIR}/lib/tkdnd2.6)
-
-
# OpenNURBS Library
set(opennurbs_ALIASES ENABLE_OPENNURBS)
set(opennurbs_DESCRIPTION "
Deleted: brlcad/trunk/src/other/tkdnd.dist
===================================================================
--- brlcad/trunk/src/other/tkdnd.dist 2013-03-27 16:28:31 UTC (rev 54916)
+++ brlcad/trunk/src/other/tkdnd.dist 2013-03-27 16:30:10 UTC (rev 54917)
@@ -1,23 +0,0 @@
-SET(tkdnd_ignore_files
-Changelog
-cmake
-configure.in
-demos
-doc
-license.terms
-unix/tkUnixSelect.c
-unix/TkDND_XDND.c
-unix/Cursors.c
-library/tkdnd.tcl
-library/tkdnd_compat.tcl
-library/tkdnd_macosx.tcl
-library/tkdnd_unix.tcl
-library/tkdnd_windows.tcl
-macosx/macdnd.m
-tclconfig/ChangeLog
-tclconfig/README.txt
-tclconfig/install-sh
-tclconfig/tcl.m4
-win/OleDND.h
-win/TkDND_OleDND.cpp
-)
Deleted: brlcad/trunk/src/other/tktreectrl.dist
===================================================================
--- brlcad/trunk/src/other/tktreectrl.dist 2013-03-27 16:28:31 UTC (rev
54916)
+++ brlcad/trunk/src/other/tktreectrl.dist 2013-03-27 16:30:10 UTC (rev
54917)
@@ -1,25 +0,0 @@
-SET(tktreectrl_ignore_files
-ChangeLog
-CMake
-aclocal.m4
-configure
-configure.ac
-demos
-doc
-generic/qebind.h
-generic/tkTreeCtrl.h
-generic/tkTreeElem.h
-library/filelist-bindings.tcl
-library/treectrl.tcl
-license.terms
-macosx/tkMacOSXTree.c
-pkg.m4
-shellicon
-tclconfig
-tests
-treectrl.dll.manifest.in
-treectrl.rc
-unix/tkUnixTree.c
-win/tkWinTree.c
-winrc.m4
-)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
