Revision: 42309
http://brlcad.svn.sourceforge.net/brlcad/?rev=42309&view=rev
Author: starseeker
Date: 2011-01-16 01:40:45 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
Gah. Committed the libtclcad change, but didn't commit any of the
CMakeLists.txt files that might have made it work. Change where things are put
in the build tree for tcl scripts.
Modified Paths:
--------------
brlcad/branches/cmake/src/tclscripts/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/archer/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/archer/images/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/boteditor/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/geometree/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/hv3/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/lib/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/mged/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/pl-dm/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/rtwizard/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/rtwizard/lib/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/sdialogs/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/sdialogs/scripts/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/swidgets/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/swidgets/images/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/swidgets/scripts/CMakeLists.txt
brlcad/branches/cmake/src/tclscripts/util/CMakeLists.txt
Modified: brlcad/branches/cmake/src/tclscripts/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/CMakeLists.txt 2011-01-16 01:38:57 UTC
(rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/CMakeLists.txt 2011-01-16 01:40:45 UTC
(rev 42309)
@@ -1,24 +1,24 @@
# Convenience macros for building pkgIndex.tcl and tclIndex files
-MACRO(pkgIndex_BUILD name srcdir targetdir)
+MACRO(pkgIndex_BUILD name targetdir)
ADD_CUSTOM_COMMAND(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl
- COMMAND btclsh ${CMAKE_SOURCE_DIR}/src/tclscripts/ampi.tcl
${CMAKE_CURRENT_BINARY_DIR}
+ OUTPUT ${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/pkgIndex.tcl
+ COMMAND btclsh ${CMAKE_SOURCE_DIR}/src/tclscripts/ampi.tcl
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}
DEPENDS btclsh
)
- ADD_CUSTOM_TARGET(${name}_pkgIndex.tcl ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
-ENDMACRO(pkgIndex_BUILD name srcdir targetdir)
+ ADD_CUSTOM_TARGET(${name}_pkgIndex.tcl ALL DEPENDS
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/pkgIndex.tcl)
+ INSTALL(FILES ${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/pkgIndex.tcl
DESTINATION ${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
+ENDMACRO(pkgIndex_BUILD name targetdir)
-MACRO(tclIndex_BUILD name srcdir targetdir)
+MACRO(tclIndex_BUILD name targetdir)
ADD_CUSTOM_COMMAND(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
- COMMAND btclsh ${CMAKE_SOURCE_DIR}/src/tclscripts/ami.tcl
${CMAKE_CURRENT_BINARY_DIR}
+ OUTPUT ${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/tclIndex
+ COMMAND btclsh ${CMAKE_SOURCE_DIR}/src/tclscripts/ami.tcl
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}
DEPENDS btclsh
)
- ADD_CUSTOM_TARGET(${name}_tclIndex ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/tclIndex)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tclIndex DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
-ENDMACRO(tclIndex_BUILD name srcdir targetdir)
+ ADD_CUSTOM_TARGET(${name}_tclIndex ALL DEPENDS
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/tclIndex)
+ INSTALL(FILES ${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/tclIndex
DESTINATION ${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
+ENDMACRO(tclIndex_BUILD name targetdir)
# Now that the macros are defined, we can add tclscript subdirs
@@ -50,8 +50,8 @@
mouse.tcl
vmath.tcl
)
-FILE(COPY ${toplevel_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${toplevel_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts)
INSTALL(FILES ${toplevel_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts)
-pkgIndex_BUILD(tclscripts ${CMAKE_CURRENT_SOURCE_DIR} tclscripts)
-tclIndex_BUILD(tclscripts ${CMAKE_CURRENT_SOURCE_DIR} tclscripts)
+pkgIndex_BUILD(tclscripts tclscripts)
+tclIndex_BUILD(tclscripts tclscripts)
Modified: brlcad/branches/cmake/src/tclscripts/archer/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/archer/CMakeLists.txt 2011-01-16
01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/archer/CMakeLists.txt 2011-01-16
01:40:45 UTC (rev 42309)
@@ -36,9 +36,9 @@
Utility.tcl
Wizard.tcl
)
-FILE(COPY ${archer_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${archer_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/archer)
INSTALL(FILES ${archer_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/archer)
-pkgIndex_BUILD(archer ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/archer)
-tclIndex_BUILD(archer ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/archer)
+pkgIndex_BUILD(archer tclscripts/archer)
+tclIndex_BUILD(archer tclscripts/archer)
Modified: brlcad/branches/cmake/src/tclscripts/archer/images/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/archer/images/CMakeLists.txt
2011-01-16 01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/archer/images/CMakeLists.txt
2011-01-16 01:40:45 UTC (rev 42309)
@@ -260,6 +260,6 @@
wizard.png
)
-FILE(COPY ${archer_images} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${archer_images} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/archer/images)
INSTALL(FILES ${archer_images} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/archer/images)
Modified: brlcad/branches/cmake/src/tclscripts/boteditor/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/boteditor/CMakeLists.txt
2011-01-16 01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/boteditor/CMakeLists.txt
2011-01-16 01:40:45 UTC (rev 42309)
@@ -4,5 +4,5 @@
botTools.tcl
)
-FILE(COPY ${boteditor_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${boteditor_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/boteditor)
INSTALL(FILES ${boteditor_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/boteditor)
Modified: brlcad/branches/cmake/src/tclscripts/geometree/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/geometree/CMakeLists.txt
2011-01-16 01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/geometree/CMakeLists.txt
2011-01-16 01:40:45 UTC (rev 42309)
@@ -3,9 +3,9 @@
geometree.tcl
)
-FILE(COPY ${geometree_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${geometree_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/geomtree)
INSTALL(FILES ${geometree_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/geometree)
-pkgIndex_BUILD(geometree ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/geometree)
-tclIndex_BUILD(geometree ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/geometree)
+pkgIndex_BUILD(geometree tclscripts/geometree)
+tclIndex_BUILD(geometree tclscripts/geometree)
Modified: brlcad/branches/cmake/src/tclscripts/hv3/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/hv3/CMakeLists.txt 2011-01-16
01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/hv3/CMakeLists.txt 2011-01-16
01:40:45 UTC (rev 42309)
@@ -7,12 +7,12 @@
hv3_util.tcl
snit.tcl
)
-FILE(COPY ${hv3_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${hv3_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/hv3)
INSTALL(FILES ${hv3_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/hv3)
install(FILES hv3.man DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/doc)
install(FILES tkhtml.n DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/mann)
-pkgIndex_BUILD(hv3 ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/hv3)
-tclIndex_BUILD(hv3 ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/hv3)
+pkgIndex_BUILD(hv3 tclscripts/hv3)
+tclIndex_BUILD(hv3 tclscripts/hv3)
Modified: brlcad/branches/cmake/src/tclscripts/lib/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/lib/CMakeLists.txt 2011-01-16
01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/lib/CMakeLists.txt 2011-01-16
01:40:45 UTC (rev 42309)
@@ -23,9 +23,9 @@
ViewAxesControl.tcl
)
-FILE(COPY ${lib_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${lib_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/lib)
INSTALL(FILES ${lib_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/lib)
-pkgIndex_BUILD(lib ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/lib)
-tclIndex_BUILD(lib ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/lib)
+pkgIndex_BUILD(lib tclscripts/lib)
+tclIndex_BUILD(lib tclscripts/lib)
Modified: brlcad/branches/cmake/src/tclscripts/mged/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/mged/CMakeLists.txt 2011-01-16
01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/mged/CMakeLists.txt 2011-01-16
01:40:45 UTC (rev 42309)
@@ -87,11 +87,11 @@
xclone.tcl
)
-FILE(COPY ${mged_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${mged_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/mged)
INSTALL(FILES ${mged_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/mged)
-pkgIndex_BUILD(mged ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/mged)
-tclIndex_BUILD(mged ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/mged)
+pkgIndex_BUILD(mged tclscripts/mged)
+tclIndex_BUILD(mged tclscripts/mged)
SET(mged_tcl_DATA
l_i0_v0_s0.gif
@@ -138,5 +138,5 @@
mike-tux.ppm
mike-tux.png
)
-FILE(COPY ${mged_tcl_DATA} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${mged_tcl_DATA} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/mged)
INSTALL(FILES ${mged_tcl_DATA} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/mged)
Modified: brlcad/branches/cmake/src/tclscripts/pl-dm/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/pl-dm/CMakeLists.txt 2011-01-16
01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/pl-dm/CMakeLists.txt 2011-01-16
01:40:45 UTC (rev 42309)
@@ -4,9 +4,9 @@
menu.tcl
)
-FILE(COPY ${pl-dm_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${pl-dm_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/pl-dm)
INSTALL(FILES ${pl-dm_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/pl-dm)
-pkgIndex_BUILD(pl-dm ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/pl-dm)
-tclIndex_BUILD(pl-dm ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/pl-dm)
+pkgIndex_BUILD(pl-dm tclscripts/pl-dm)
+tclIndex_BUILD(pl-dm tclscripts/pl-dm)
Modified: brlcad/branches/cmake/src/tclscripts/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/rtwizard/CMakeLists.txt
2011-01-16 01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/rtwizard/CMakeLists.txt
2011-01-16 01:40:45 UTC (rev 42309)
@@ -1,31 +1,23 @@
ADD_SUBDIRECTORY(lib)
ADD_CUSTOM_COMMAND(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/rtwizard
- COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/rtwizard.tcl ${CMAKE_CURRENT_BINARY_DIR}/rtwizard
+ OUTPUT ${CMAKE_BINARY_DIR}/bin/rtwizard
+ COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/rtwizard.tcl ${CMAKE_BINARY_DIR}/bin/rtwizard
)
-ADD_CUSTOM_TARGET(rtwizard ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/rtwizard)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rtwizard.tcl
${CMAKE_BINARY_DIR}/bin/rtwizard COPYONLY)
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/rtwizard DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR})
+ADD_CUSTOM_TARGET(rtwizard ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/rtwizard)
+INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/bin/rtwizard DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR})
-
SET(rtwizard_TCLSCRIPTS
RaytraceWizard.tcl
rtwizard.bat
rtwizard.tcl
)
-
-FILE(COPY ${rtwizard_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${rtwizard_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/rtwizard)
INSTALL(FILES ${rtwizard_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/rtwizard)
-pkgIndex_BUILD(rtwizard ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/rtwizard)
-tclIndex_BUILD(rtwizard ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/rtwizard)
+pkgIndex_BUILD(rtwizard tclscripts/rtwizard)
+tclIndex_BUILD(rtwizard tclscripts/rtwizard)
-SET(rtwizard_TCLSCRIPT_FILES
- ${CMAKE_BINARY_DIR}/bin/rtwizard
- )
-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
"${rtwizard_TCLSCRIPT_FILES}")
-
# Examples
SET(PictureTypeA_DATA
@@ -35,7 +27,7 @@
examples/PictureTypeA/title.txt
examples/PictureTypeA/preview.small.gif
)
-FILE(COPY ${PictureTypeA_DATA} DESTINATION
${CMAKE_CURRENT_BINARY_DIR}/examples/PictureTypeA)
+FILE(COPY ${PictureTypeA_DATA} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeA)
INSTALL(FILES ${PictureTypeA_DATA} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeA)
@@ -46,7 +38,7 @@
examples/PictureTypeB/title.txt
examples/PictureTypeB/preview.small.gif
)
-FILE(COPY ${PictureTypeB_DATA} DESTINATION
${CMAKE_CURRENT_BINARY_DIR}/examples/PictureTypeB)
+FILE(COPY ${PictureTypeB_DATA} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeB)
INSTALL(FILES ${PictureTypeB_DATA} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeB)
@@ -57,7 +49,7 @@
examples/PictureTypeC/title.txt
examples/PictureTypeC/preview.small.gif
)
-FILE(COPY ${PictureTypeC_DATA} DESTINATION
${CMAKE_CURRENT_BINARY_DIR}/examples/PictureTypeC)
+FILE(COPY ${PictureTypeC_DATA} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeC)
INSTALL(FILES ${PictureTypeC_DATA} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeC)
@@ -68,7 +60,7 @@
examples/PictureTypeD/title.txt
examples/PictureTypeD/preview.small.gif
)
-FILE(COPY ${PictureTypeD_DATA} DESTINATION
${CMAKE_CURRENT_BINARY_DIR}/examples/PictureTypeD)
+FILE(COPY ${PictureTypeD_DATA} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeD)
INSTALL(FILES ${PictureTypeD_DATA} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeD)
@@ -79,7 +71,7 @@
examples/PictureTypeE/title.txt
examples/PictureTypeE/preview.small.gif
)
-FILE(COPY ${PictureTypeE_DATA} DESTINATION
${CMAKE_CURRENT_BINARY_DIR}/examples/PictureTypeE)
+FILE(COPY ${PictureTypeE_DATA} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeE)
INSTALL(FILES ${PictureTypeE_DATA} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeE)
@@ -90,6 +82,6 @@
examples/PictureTypeF/title.txt
examples/PictureTypeF/preview.small.gif
)
-FILE(COPY ${PictureTypeF_DATA} DESTINATION
${CMAKE_CURRENT_BINARY_DIR}/examples/PictureTypeF)
+FILE(COPY ${PictureTypeF_DATA} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeF)
INSTALL(FILES ${PictureTypeF_DATA} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/rtwizard/examples/PictureTypeF)
Modified: brlcad/branches/cmake/src/tclscripts/rtwizard/lib/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/rtwizard/lib/CMakeLists.txt
2011-01-16 01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/rtwizard/lib/CMakeLists.txt
2011-01-16 01:40:45 UTC (rev 42309)
@@ -21,9 +21,9 @@
Wizard.itk
)
-FILE(COPY ${rtwizard_lib_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${rtwizard_lib_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/rtwizard/lib)
INSTALL(FILES ${rtwizard_lib_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/rtwizard/lib)
-pkgIndex_BUILD(rtwizard_lib ${CMAKE_CURRENT_SOURCE_DIR}
tclscripts/rtwizard/lib)
-tclIndex_BUILD(rtwizard_lib ${CMAKE_CURRENT_SOURCE_DIR}
tclscripts/rtwizard/lib)
+pkgIndex_BUILD(rtwizard_lib tclscripts/rtwizard/lib)
+tclIndex_BUILD(rtwizard_lib tclscripts/rtwizard/lib)
Modified: brlcad/branches/cmake/src/tclscripts/sdialogs/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/sdialogs/CMakeLists.txt
2011-01-16 01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/sdialogs/CMakeLists.txt
2011-01-16 01:40:45 UTC (rev 42309)
@@ -4,9 +4,9 @@
sdialogs.tcl
)
-FILE(COPY ${sdialogs_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${sdialogs_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/sdialogs)
INSTALL(FILES ${sdialogs_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/sdialogs)
-pkgIndex_BUILD(sdialogs ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/sdialogs)
-tclIndex_BUILD(sdialogs ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/sdialogs)
+pkgIndex_BUILD(sdialogs tclscripts/sdialogs)
+tclIndex_BUILD(sdialogs tclscripts/sdialogs)
Modified: brlcad/branches/cmake/src/tclscripts/sdialogs/scripts/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/sdialogs/scripts/CMakeLists.txt
2011-01-16 01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/sdialogs/scripts/CMakeLists.txt
2011-01-16 01:40:45 UTC (rev 42309)
@@ -3,8 +3,8 @@
listdialog.itk
stddlgs.tcl
)
-FILE(COPY ${sdialogs_scripts_TCLSCRIPTS} DESTINATION
${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${sdialogs_scripts_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/sdialogs/scripts)
INSTALL(FILES ${sdialogs_scripts_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/sdialogs/scripts)
-tclIndex_BUILD(sdialogs_scripts ${CMAKE_CURRENT_SOURCE_DIR}
tclscripts/sdialogs/scripts)
+tclIndex_BUILD(sdialogs_scripts tclscripts/sdialogs/scripts)
Modified: brlcad/branches/cmake/src/tclscripts/swidgets/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/swidgets/CMakeLists.txt
2011-01-16 01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/swidgets/CMakeLists.txt
2011-01-16 01:40:45 UTC (rev 42309)
@@ -5,9 +5,9 @@
swidgets.tcl
)
-FILE(COPY ${swidgets_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${swidgets_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/swidgets)
INSTALL(FILES ${swidgets_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/swidgets)
-pkgIndex_BUILD(swidgets ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/swidgets)
-tclIndex_BUILD(swidgets ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/swidgets)
+pkgIndex_BUILD(swidgets tclscripts/swidgets)
+tclIndex_BUILD(swidgets tclscripts/swidgets)
Modified: brlcad/branches/cmake/src/tclscripts/swidgets/images/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/swidgets/images/CMakeLists.txt
2011-01-16 01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/swidgets/images/CMakeLists.txt
2011-01-16 01:40:45 UTC (rev 42309)
@@ -6,5 +6,5 @@
plus.xbm
tip.gif
)
-FILE(COPY ${swidgets_image_DATA} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${swidgets_image_DATA} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/swidgets/images)
INSTALL(FILES ${swidgets_image_DATA} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/swidgets/images)
Modified: brlcad/branches/cmake/src/tclscripts/swidgets/scripts/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/swidgets/scripts/CMakeLists.txt
2011-01-16 01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/swidgets/scripts/CMakeLists.txt
2011-01-16 01:40:45 UTC (rev 42309)
@@ -6,8 +6,8 @@
tree.itk
)
-FILE(COPY ${swidgets_scripts_TCLSCRIPTS} DESTINATION
${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${swidgets_scripts_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/swidgets/scripts)
INSTALL(FILES ${swidgets_scripts_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/swidgets/scripts)
-tclIndex_BUILD(swidgets_scripts ${CMAKE_CURRENT_SOURCE_DIR}
tclscripts/swidgets/scripts)
+tclIndex_BUILD(swidgets_scripts tclscripts/swidgets/scripts)
Modified: brlcad/branches/cmake/src/tclscripts/util/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tclscripts/util/CMakeLists.txt 2011-01-16
01:38:57 UTC (rev 42308)
+++ brlcad/branches/cmake/src/tclscripts/util/CMakeLists.txt 2011-01-16
01:40:45 UTC (rev 42309)
@@ -2,9 +2,9 @@
expand_int_ranges.tcl
luniq.tcl
)
-FILE(COPY ${util_TCLSCRIPTS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+FILE(COPY ${util_TCLSCRIPTS} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/util)
INSTALL(FILES ${util_TCLSCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts/util)
-pkgIndex_BUILD(util ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/util)
-tclIndex_BUILD(util ${CMAKE_CURRENT_SOURCE_DIR} tclscripts/util)
+pkgIndex_BUILD(util tclscripts/util)
+tclIndex_BUILD(util tclscripts/util)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
