Revision: 40503
http://brlcad.svn.sourceforge.net/brlcad/?rev=40503&view=rev
Author: starseeker
Date: 2010-09-08 17:00:28 +0000 (Wed, 08 Sep 2010)
Log Message:
-----------
Minor fixes and enable all of src/tclscripts
Modified Paths:
--------------
brlcad/branches/cmake/src/tclscripts/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/mged/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/rtwizard/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/swidgets/scripts/CMakeLists.txt
Modified: brlcad/branches/cmake/src/tclscripts/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/CMakeLists.txt 2010-09-08 16:04:02 UTC
(rev 40502)
+++ brlcad/branches/cmake/src/tclscripts/CMakeLists.txt 2010-09-08 17:00:28 UTC
(rev 40503)
@@ -1,3 +1,5 @@
+# Convenience macros for building pkgIndex.tcl and tclIndex files
+
MACRO(pkgIndex_BUILD name srcdir targetdir)
ADD_CUSTOM_COMMAND(
OUTPUT ${srcdir}/pkgIndex.tcl
@@ -19,19 +21,19 @@
ENDMACRO(tclIndex_BUILD name srcdir targetdir)
-
+# Now that the macros are defined, we can add tclscript subdirs
ADD_SUBDIRECTORY(archer)
ADD_SUBDIRECTORY(boteditor)
ADD_SUBDIRECTORY(geometree)
ADD_SUBDIRECTORY(hv3)
-#ADD_SUBDIRECTORY(lib)
-#ADD_SUBDIRECTORY(mged)
-#ADD_SUBDIRECTORY(nirt)
-#ADD_SUBDIRECTORY(pl-dm)
-#ADD_SUBDIRECTORY(rtwizard)
-#ADD_SUBDIRECTORY(sdialogs)
-#ADD_SUBDIRECTORY(swidgets)
-#ADD_SUBDIRECTORY(util)
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(mged)
+ADD_SUBDIRECTORY(nirt)
+ADD_SUBDIRECTORY(pl-dm)
+ADD_SUBDIRECTORY(rtwizard)
+ADD_SUBDIRECTORY(sdialogs)
+ADD_SUBDIRECTORY(swidgets)
+ADD_SUBDIRECTORY(util)
SET(toplevel_TCLSCRIPTS
ami.tcl
Modified: brlcad/branches/cmake/src/tclscripts/mged/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/mged/CMakeLists.txt 2010-09-08
16:04:02 UTC (rev 40502)
+++ brlcad/branches/cmake/src/tclscripts/mged/CMakeLists.txt 2010-09-08
17:00:28 UTC (rev 40503)
@@ -1,7 +1,3 @@
-
-this_dir = tclscripts/mged
-tcldir = $(BRLCAD_DATA)/$(this_dir)
-
IF(BRLCAD-ENABLE_BUILD_DOCS)
SET(mgedman_TCLSCRIPTS
man.tcl
Modified: brlcad/branches/cmake/src/tclscripts/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/rtwizard/CMakeLists.txt
2010-09-08 16:04:02 UTC (rev 40502)
+++ brlcad/branches/cmake/src/tclscripts/rtwizard/CMakeLists.txt
2010-09-08 17:00:28 UTC (rev 40503)
@@ -5,7 +5,7 @@
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/rtwizard.tcl ${CMAKE_CURRENT_BINARY_DIR}/rtwizard
)
ADD_CUSTOM_TARGET(rtwizard ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/rtwizard)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/rtwizard DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/tclscripts/rtwizard)
+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/rtwizard DESTINATION
${BRLCAD_INSTALL_BIN_DIR})
SET(rtwizard_TCLSCRIPTS
@@ -29,61 +29,61 @@
# Examples
SET(PictureTypeA_DATA
- examples/PictureTypeA/gdesc.txt
- examples/PictureTypeA/ghelpstr.txt
- examples/PictureTypeA/gintro.txt
- examples/PictureTypeA/gtitle.txt
- examples/PictureTypeA/gpreview.small.gif
+ examples/PictureTypeA/desc.txt
+ examples/PictureTypeA/helpstr.txt
+ examples/PictureTypeA/intro.txt
+ examples/PictureTypeA/title.txt
+ examples/PictureTypeA/preview.small.gif
)
INSTALL(FILES ${PictureTypeA_DATA} DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeA)
SET(PictureTypeB_DATA
- examples/PictureTypeB/gdesc.txt
- examples/PictureTypeB/ghelpstr.txt
- examples/PictureTypeB/gintro.txt
- examples/PictureTypeB/gtitle.txt
- examples/PictureTypeB/gpreview.small.gif
+ examples/PictureTypeB/desc.txt
+ examples/PictureTypeB/helpstr.txt
+ examples/PictureTypeB/intro.txt
+ examples/PictureTypeB/title.txt
+ examples/PictureTypeB/preview.small.gif
)
INSTALL(FILES ${PictureTypeB_DATA} DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeB)
SET(PictureTypeC_DATA
- examples/PictureTypeC/gdesc.txt
- examples/PictureTypeC/ghelpstr.txt
- examples/PictureTypeC/gintro.txt
- examples/PictureTypeC/gtitle.txt
- examples/PictureTypeC/gpreview.small.gif
+ examples/PictureTypeC/desc.txt
+ examples/PictureTypeC/helpstr.txt
+ examples/PictureTypeC/intro.txt
+ examples/PictureTypeC/title.txt
+ examples/PictureTypeC/preview.small.gif
)
INSTALL(FILES ${PictureTypeC_DATA} DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeC)
SET(PictureTypeD_DATA
- examples/PictureTypeD/gdesc.txt
- examples/PictureTypeD/ghelpstr.txt
- examples/PictureTypeD/gintro.txt
- examples/PictureTypeD/gtitle.txt
- examples/PictureTypeD/gpreview.small.gif
+ examples/PictureTypeD/desc.txt
+ examples/PictureTypeD/helpstr.txt
+ examples/PictureTypeD/intro.txt
+ examples/PictureTypeD/title.txt
+ examples/PictureTypeD/preview.small.gif
)
INSTALL(FILES ${PictureTypeD_DATA} DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeD)
SET(PictureTypeE_DATA
- examples/PictureTypeE/gdesc.txt
- examples/PictureTypeE/ghelpstr.txt
- examples/PictureTypeE/gintro.txt
- examples/PictureTypeE/gtitle.txt
- examples/PictureTypeE/gpreview.small.gif
+ examples/PictureTypeE/desc.txt
+ examples/PictureTypeE/helpstr.txt
+ examples/PictureTypeE/intro.txt
+ examples/PictureTypeE/title.txt
+ examples/PictureTypeE/preview.small.gif
)
INSTALL(FILES ${PictureTypeE_DATA} DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeE)
SET(PictureTypeF_DATA
- examples/PictureTypeF/gdesc.txt
- examples/PictureTypeF/ghelpstr.txt
- examples/PictureTypeF/gintro.txt
- examples/PictureTypeF/gtitle.txt
- examples/PictureTypeF/gpreview.small.gif
+ examples/PictureTypeF/desc.txt
+ examples/PictureTypeF/helpstr.txt
+ examples/PictureTypeF/intro.txt
+ examples/PictureTypeF/title.txt
+ examples/PictureTypeF/preview.small.gif
)
INSTALL(FILES ${PictureTypeF_DATA} DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeF)
Modified: brlcad/branches/cmake/src/tclscripts/swidgets/scripts/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/swidgets/scripts/CMakeLists.txt
2010-09-08 16:04:02 UTC (rev 40502)
+++ brlcad/branches/cmake/src/tclscripts/swidgets/scripts/CMakeLists.txt
2010-09-08 17:00:28 UTC (rev 40503)
@@ -1,7 +1,7 @@
SET(swidgets_scripts_TCLSCRIPTS
selectlists.itk
tkgetdir.itk
- togglearrow.itki
+ togglearrow.itk
tooltip.itk
tree.itk
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
