Menu
▾
▴
octaviz-cvsupdate — CVS update notifications
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(14) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(1) |
Mar
(8) |
Apr
(6) |
May
(5) |
Jun
(2) |
Jul
(2) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
(2) |
Dec
(21) |
| 2007 |
Jan
(9) |
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(24) |
Nov
|
Dec
(15) |
| 2008 |
Jan
(6) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:53
|
Update of /cvsroot/octaviz/octaviz/Common In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044/Common Modified Files: CMakeLists.txt Log Message: Revamped build system Interface to the WRAP macro simplified. Parallel builds should work now; out-of-source build should work as well. A pre-compiled header file can be used (alas, it doesn't seem to speed the build up that much). Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/CMakeLists.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- CMakeLists.txt 12 Oct 2007 10:09:32 -0000 1.11 +++ CMakeLists.txt 22 Dec 2007 22:03:54 -0000 1.12 @@ -1,27 +1,46 @@ -SET(KIT_WRAP_DEPS) - ADD_LIBRARY( octaviz SHARED octaviz.cc ) -OCTAVE_WRAP_VTK(Common "${KIT_WRAP_DEPS}") +OCTAVE_WRAP_VTK(Common) +# This sets INCLUDE_FLAGS and LINK_FLAGS also for the .cc files below + INCLUDE_DIRECTORIES(${OCTINCLUDEDIR} "${OCTINCLUDEDIR}/octave" ) LINK_LIBRARIES(octinterp octave cruft vtkCommon) LINK_DIRECTORIES(${OCTLIBDIR}) -ADD_CUSTOM_COMMAND( OUTPUT vtk_init.oct COMMAND ${MKOCTFILE} ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_init.cc ) -ADD_CUSTOM_COMMAND( OUTPUT vtkInitializeInteractor.oct COMMAND ${MKOCTFILE} ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtkInitializeInteractor.cc) -ADD_CUSTOM_COMMAND( OUTPUT vtkRaiseWindow.oct COMMAND ${MKOCTFILE} ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -lvtkRendering -L. vtkRaiseWindow.cc ) -ADD_CUSTOM_COMMAND( OUTPUT vtk_print_ref_table.oct COMMAND ${MKOCTFILE} ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_print_ref_table.cc ) -ADD_CUSTOM_COMMAND( OUTPUT vtk_get_pointer.oct COMMAND ${MKOCTFILE} ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_get_pointer.cc ) - -ADD_CUSTOM_TARGET( Common ALL COMMAND touch Common DEPENDS octaviz ${all_oct} vtk_init.oct vtkInitializeInteractor.oct vtkRaiseWindow.oct vtk_print_ref_table.oct vtk_get_pointer.oct ) +SET (common_octs) + # track the .oct files for shorter DEPENDS lines -#ADD_CUSTOM_TARGET(vtkWindow.oct ALL mkoctfile ${oct_flags} ${oct_link_flags} vtkWindow.cc) +# How to build the .oct files in this directory +FOREACH(class vtk_init vtkInitializeInteractor vtk_print_ref_table vtk_get_pointer vtkRaiseWindow) -INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkInitializeInteractor.oct vtk_init.oct vtkRaiseWindow.oct vtk_get_pointer.oct vtk_print_ref_table.oct) -INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct}) -#MESSAGE(${all_oct}) + # FIXME: vtkRaiseWindow needs vtkRendering on Apple?! + IF(${class} STREQUAL "vtkRaiseWindow") + SET(APPLE_FLAG "-lvtkRendering") + ELSE(${class} STREQUAL "vtkRaiseWindow") + SET(APPLE_FLAG) + ENDIF(${class} STREQUAL "vtkRaiseWindow") + + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct + COMMAND ${CMAKE_COMMAND} + ARGS -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${class}.cc + ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc + # mkoctfile leaves .o files in the directory where it is called, so we + # must call it in the binary build directory + COMMAND ${MKOCTFILE} + ARGS --verbose ${WNODEPRECATED} ${INCLUDE_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR} + ${LINK_FLAGS} ${APPLE_FLAG} + -Wl,-rpath=${OCTAVIZ_RPATH} + --output ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct + ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc + DEPENDS octaviz + COMMENT "Building Octaviz' ${class}.oct from ${class}.cc" + ) + SET (common_octs ${common_octs} ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct) +ENDFOREACH(class) -# Remove prefix from octave lib install dir -STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OUT_MTCH ${OCTLIBDIR}) -INSTALL_TARGETS(${OUT_MTCH} octaviz) +# Build the few .oct files as part of a "OctavizCommonFiles" target +ADD_CUSTOM_TARGET( OctavizCommonFiles ALL DEPENDS octaviz ${common_octs} ) +# Install the .oct files and the shared library +INSTALL(PROGRAMS ${common_octs} DESTINATION ${OCTAVIZ_OCT_DIR}) +INSTALL(TARGETS octaviz LIBRARY DESTINATION ${OCTAVIZ_SHARED_DIR}) |
|
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:53
|
Update of /cvsroot/octaviz/octaviz/Parallel In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044/Parallel Modified Files: CMakeLists.txt Log Message: Revamped build system Interface to the WRAP macro simplified. Parallel builds should work now; out-of-source build should work as well. A pre-compiled header file can be used (alas, it doesn't seem to speed the build up that much). Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Parallel/CMakeLists.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- CMakeLists.txt 8 Oct 2007 06:25:40 -0000 1.3 +++ CMakeLists.txt 22 Dec 2007 22:03:55 -0000 1.4 @@ -1,5 +1 @@ -SET( KIT_WRAP_DEPS Rendering ) -OCTAVE_WRAP_VTK( Parallel "${KIT_WRAP_DEPS}") -ADD_CUSTOM_TARGET( Parallel ALL COMMAND touch Parallel DEPENDS ${all_oct} ) -INSTALL_PROGRAMS( ${OCT_INST_DIR}/octaviz ${all_oct} ) -#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkRendering.oct) +OCTAVE_WRAP_VTK(Parallel) |
|
From: Thomas W. <tho...@us...> - 2007-12-22 21:39:03
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22277 Modified Files: vtkGetDataRoot.m Log Message: Revert back to @VTK_DATA_ROOT@ (probably a configured file got checked in) Index: vtkGetDataRoot.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtkGetDataRoot.m,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- vtkGetDataRoot.m 17 Oct 2007 14:38:16 -0000 1.6 +++ vtkGetDataRoot.m 22 Dec 2007 21:39:04 -0000 1.7 @@ -37,7 +37,7 @@ env_data_root = getenv("VTK_DATA_ROOT"); ## set at Octaviz's compile time - oct_data_root = ""; + oct_data_root = "@VTK_DATA_ROOT@"; ## locally set path local_data_root = "/usr/share/VTKData"; |
|
From: Jonathan S. <jjs...@us...> - 2007-10-19 19:27:24
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11716 Modified Files: vtk_clear.m vtk_meshc.m vtk_surfc.m Log Message: more work on contour view and Z axis visibility Index: vtk_clear.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_clear.m,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- vtk_clear.m 19 Oct 2007 14:38:29 -0000 1.7 +++ vtk_clear.m 19 Oct 2007 19:27:25 -0000 1.8 @@ -45,8 +45,6 @@ endwhile ## set axes to default settings (contour plots change some of these) - f.axes.XAxisVisibilityOn(); - f.axes.YAxisVisibilityOn(); f.axes.ZAxisVisibilityOn(); f.axes.SetFlyModeToOuterEdges(); f.renderer.GetActiveCamera().ParallelProjectionOff(); Index: vtk_surfc.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_surfc.m,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- vtk_surfc.m 25 Dec 2006 20:12:50 -0000 1.5 +++ vtk_surfc.m 19 Oct 2007 19:27:25 -0000 1.6 @@ -99,6 +99,9 @@ endif f = vtk_figure(0); - f.axes.YAxisVisibilityOn(); # turn back on the "Z" axes (vtk_contour call turns it off) + ## reset some axes features after the contour function call + f.axes.ZAxisVisibilityOn(); + f.axes.SetFlyModeToOuterEdges(); + vtk_update(f); endfunction Index: vtk_meshc.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_meshc.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtk_meshc.m 25 Dec 2006 20:12:50 -0000 1.3 +++ vtk_meshc.m 19 Oct 2007 19:27:25 -0000 1.4 @@ -103,6 +103,9 @@ endif f = vtk_figure(0); - f.axes.YAxisVisibilityOn(); # turn back on the "Z" axes (vtk_contour call turns it off) + ## reset some axes features after the contour function call + f.axes.ZAxisVisibilityOn(); + f.axes.SetFlyModeToOuterEdges(); + vtk_update(f); endfunction |
|
From: Jonathan S. <jjs...@us...> - 2007-10-19 14:38:26
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26711 Modified Files: vtk_clear.m Log Message: more work on contour view and Z axis visibility Index: vtk_clear.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_clear.m,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- vtk_clear.m 19 Oct 2007 14:30:43 -0000 1.6 +++ vtk_clear.m 19 Oct 2007 14:38:29 -0000 1.7 @@ -49,7 +49,7 @@ f.axes.YAxisVisibilityOn(); f.axes.ZAxisVisibilityOn(); f.axes.SetFlyModeToOuterEdges(); - f.renderer.GetActiveCamera().ParallelProjectionOn(); + f.renderer.GetActiveCamera().ParallelProjectionOff(); vtk_update(f); endfunction |
|
From: Jonathan S. <jjs...@us...> - 2007-10-19 14:30:41
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23541 Modified Files: vtk_clear.m vtk_contour.m Log Message: more work on contour view and Z axis visibility Index: vtk_clear.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_clear.m,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- vtk_clear.m 17 Oct 2007 14:38:17 -0000 1.5 +++ vtk_clear.m 19 Oct 2007 14:30:43 -0000 1.6 @@ -44,9 +44,12 @@ ++i; endwhile + ## set axes to default settings (contour plots change some of these) f.axes.XAxisVisibilityOn(); f.axes.YAxisVisibilityOn(); f.axes.ZAxisVisibilityOn(); + f.axes.SetFlyModeToOuterEdges(); + f.renderer.GetActiveCamera().ParallelProjectionOn(); vtk_update(f); endfunction Index: vtk_contour.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_contour.m,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vtk_contour.m 17 Oct 2007 14:38:17 -0000 1.4 +++ vtk_contour.m 19 Oct 2007 14:30:43 -0000 1.5 @@ -135,9 +135,13 @@ f = vtk_figure(0); f.renderer.AddActor(contActor); %% turn off "Z" axis and set camera + f.axes.SetFlyModeToClosestTriad(); % sometimes helps with ZAxisVisibility bug + vtk_update(f); + f.renderer.GetActiveCamera().ParallelProjectionOn(); f.renderer.GetActiveCamera().SetPosition(0,0,1); f.renderer.GetActiveCamera().SetViewUp(0,1,0); - f.axes.YAxisVisibilityOff(); % this is buggy... JJS 10/17/07 + vtk_update(f); + f.axes.ZAxisVisibilityOff(); % this can be buggy... JJS 10/17/07 vtk_update(f); endfunction |
|
From: Jonathan S. <jjs...@us...> - 2007-10-17 14:38:19
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19597 Modified Files: vtkGetDataRoot.m vtk_clear.m vtk_contour.m Log Message: work on contour view and Z axis visibility Index: vtkGetDataRoot.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtkGetDataRoot.m,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- vtkGetDataRoot.m 25 Feb 2007 19:29:52 -0000 1.5 +++ vtkGetDataRoot.m 17 Oct 2007 14:38:16 -0000 1.6 @@ -37,7 +37,7 @@ env_data_root = getenv("VTK_DATA_ROOT"); ## set at Octaviz's compile time - oct_data_root = "@VTK_DATA_ROOT@"; + oct_data_root = ""; ## locally set path local_data_root = "/usr/share/VTKData"; Index: vtk_clear.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_clear.m,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vtk_clear.m 29 Dec 2006 04:45:27 -0000 1.4 +++ vtk_clear.m 17 Oct 2007 14:38:17 -0000 1.5 @@ -44,6 +44,9 @@ ++i; endwhile + f.axes.XAxisVisibilityOn(); + f.axes.YAxisVisibilityOn(); + f.axes.ZAxisVisibilityOn(); vtk_update(f); endfunction Index: vtk_contour.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_contour.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtk_contour.m 11 Oct 2007 14:36:57 -0000 1.3 +++ vtk_contour.m 17 Oct 2007 14:38:17 -0000 1.4 @@ -134,7 +134,10 @@ f = vtk_figure(0); f.renderer.AddActor(contActor); - f.axes.YAxisVisibilityOff(); % turn off the "Z" axes (but use YAxis command!? is this a bug?) + %% turn off "Z" axis and set camera + f.renderer.GetActiveCamera().SetPosition(0,0,1); + f.renderer.GetActiveCamera().SetViewUp(0,1,0); + f.axes.YAxisVisibilityOff(); % this is buggy... JJS 10/17/07 vtk_update(f); endfunction |
|
From: Thomas W. <tho...@us...> - 2007-10-12 10:09:30
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20916 Modified Files: CMakeLists.txt Log Message: use MKOCTFILE throughout Drop the commented symbolic link code; we have PKG_ADD and autoload() (implementing them is on the agenda, but the symbolic link clutters the CMakeLists.txt) Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- CMakeLists.txt 11 Oct 2007 16:18:14 -0000 1.13 +++ CMakeLists.txt 12 Oct 2007 10:09:32 -0000 1.14 @@ -64,18 +64,9 @@ # Build the vtkOctave wrapping utility first. ADD_SUBDIRECTORY(Wrapping) -# Hack that creates symbolic links to functions -#ADD_CUSTOM_TARGET(create_links echo "Symbolic links created.") -#FOREACH(kit ${vtk_kits}) -# ADD_CUSTOM_TARGET(create_links_${kit} cd ${kit}\; ${CMAKE_MAKE_PROGRAM} create_links) -# ADD_DEPENDENCIES(create_links create_links_${kit}) -#ENDFOREACH(kit) - # Macro to create Octave wrapper functions MACRO(OCTAVE_WRAP_VTK kit deps) STRING(TOUPPER ${kit} ukit) - # Hack for symbolic links - # ADD_CUSTOM_TARGET(create_links echo "Symlinked ${kit}") INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake) @@ -120,8 +111,7 @@ # Which flags will mkoctfile use? SET (PCHFLAGS "") - EXEC_PROGRAM("mkoctfile" ARGS "-p ALL_CXXFLAGS" OUTPUT_VARIABLE MKOCT_FLAGS_EXEC) - STRING(REGEX MATCHALL "[^ ]+" MKOCT_FLAGS_LIST ${MKOCT_FLAGS_EXEC}) + STRING(REGEX MATCHALL "[^ ]+" MKOCT_FLAGS_LIST ${ALL_CXXFLAGS}) FOREACH (flag ${MKOCT_FLAGS_LIST}) SET (PCHFLAGS ${PCHFLAGS} ${flag}) ENDFOREACH (flag ${MKOCT_FLAGS_LIST}) @@ -131,9 +121,8 @@ ADD_CUSTOM_TARGET(OctavizCommon.h.gch ALL ${CXX_COMPILER_PCH} "-c" ${PCHFLAGS} ${oct_flags} ../Common/OctavizCommon.h) ENDIF(USE_PREC_HEADERS) - EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--oct-site-dir" OUTPUT_VARIABLE OCT_INST_DIR_EXEC) # Remove prefix from oct install dir - STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OCT_INST_DIR ${OCT_INST_DIR_EXEC}) + STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OCT_INST_DIR ${OCT_SITE_DIR}) SET ( all_oct "" ) FOREACH(class ${VTK_${ukit}_CLASSES}) @@ -141,14 +130,11 @@ SET(full_name "${VTK_${ukit}_HEADER_DIR}/${class}.h") IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) ADD_CUSTOM_COMMAND( OUTPUT ${class}.cc COMMAND ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc ) - ADD_CUSTOM_COMMAND( OUTPUT ${class}.oct COMMAND mkoctfile ${oct_flags} -Wno-deprecated ${oct_link_flags} -L../Common -loctaviz ${class}.cc DEPENDS ${class}.cc ) + ADD_CUSTOM_COMMAND( OUTPUT ${class}.oct COMMAND ${MKOCTFILE} ${oct_flags} -Wno-deprecated ${oct_link_flags} -L../Common -loctaviz ${class}.cc DEPENDS ${class}.cc ) SET ( all_oct ${all_oct} ${class}.oct ) # ADD_CUSTOM_TARGET(${class}.cc ALL ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc) # ADD_CUSTOM_TARGET(${class}.oct ALL sleep 0 \; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz ${class}.cc) # ADD_DEPENDENCIES(vtk${kit}.cc ${class}.cc) - # Hack for symbolic links - # ADD_CUSTOM_TARGET(${class}_link echo Symlinking ${class}\; ln -s ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/vtk${kit}.oct ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/${class}.oct) - # ADD_DEPENDENCIES(create_links ${class}_link) ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) ENDFOREACH(class) ENDMACRO(OCTAVE_WRAP_VTK) |
|
From: Thomas W. <tho...@us...> - 2007-10-12 10:09:30
|
Update of /cvsroot/octaviz/octaviz/Common In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20916/Common Modified Files: CMakeLists.txt Log Message: use MKOCTFILE throughout Drop the commented symbolic link code; we have PKG_ADD and autoload() (implementing them is on the agenda, but the symbolic link clutters the CMakeLists.txt) Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/CMakeLists.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- CMakeLists.txt 11 Oct 2007 16:19:49 -0000 1.10 +++ CMakeLists.txt 12 Oct 2007 10:09:32 -0000 1.11 @@ -7,11 +7,11 @@ LINK_LIBRARIES(octinterp octave cruft vtkCommon) LINK_DIRECTORIES(${OCTLIBDIR}) -ADD_CUSTOM_COMMAND( OUTPUT vtk_init.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_init.cc ) -ADD_CUSTOM_COMMAND( OUTPUT vtkInitializeInteractor.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtkInitializeInteractor.cc) -ADD_CUSTOM_COMMAND( OUTPUT vtkRaiseWindow.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -lvtkRendering -L. vtkRaiseWindow.cc ) -ADD_CUSTOM_COMMAND( OUTPUT vtk_print_ref_table.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_print_ref_table.cc ) -ADD_CUSTOM_COMMAND( OUTPUT vtk_get_pointer.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_get_pointer.cc ) +ADD_CUSTOM_COMMAND( OUTPUT vtk_init.oct COMMAND ${MKOCTFILE} ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_init.cc ) +ADD_CUSTOM_COMMAND( OUTPUT vtkInitializeInteractor.oct COMMAND ${MKOCTFILE} ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtkInitializeInteractor.cc) +ADD_CUSTOM_COMMAND( OUTPUT vtkRaiseWindow.oct COMMAND ${MKOCTFILE} ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -lvtkRendering -L. vtkRaiseWindow.cc ) +ADD_CUSTOM_COMMAND( OUTPUT vtk_print_ref_table.oct COMMAND ${MKOCTFILE} ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_print_ref_table.cc ) +ADD_CUSTOM_COMMAND( OUTPUT vtk_get_pointer.oct COMMAND ${MKOCTFILE} ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_get_pointer.cc ) ADD_CUSTOM_TARGET( Common ALL COMMAND touch Common DEPENDS octaviz ${all_oct} vtk_init.oct vtkInitializeInteractor.oct vtkRaiseWindow.oct vtk_print_ref_table.oct vtk_get_pointer.oct ) |
|
From: Jonathan S. <jjs...@us...> - 2007-10-11 16:19:47
|
Update of /cvsroot/octaviz/octaviz/Common In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9732 Modified Files: CMakeLists.txt Log Message: Mac OS X needs -lvtkRendering flag for vtkRaiseWindow Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/CMakeLists.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- CMakeLists.txt 11 Oct 2007 07:34:53 -0000 1.9 +++ CMakeLists.txt 11 Oct 2007 16:19:49 -0000 1.10 @@ -9,7 +9,7 @@ ADD_CUSTOM_COMMAND( OUTPUT vtk_init.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_init.cc ) ADD_CUSTOM_COMMAND( OUTPUT vtkInitializeInteractor.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtkInitializeInteractor.cc) -ADD_CUSTOM_COMMAND( OUTPUT vtkRaiseWindow.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtkRaiseWindow.cc ) +ADD_CUSTOM_COMMAND( OUTPUT vtkRaiseWindow.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -lvtkRendering -L. vtkRaiseWindow.cc ) ADD_CUSTOM_COMMAND( OUTPUT vtk_print_ref_table.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_print_ref_table.cc ) ADD_CUSTOM_COMMAND( OUTPUT vtk_get_pointer.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_get_pointer.cc ) |
|
From: Jonathan S. <jjs...@us...> - 2007-10-11 16:18:12
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9263 Modified Files: CMakeLists.txt Log Message: Mac OS X vtk file exclusions added Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- CMakeLists.txt 11 Oct 2007 07:34:53 -0000 1.12 +++ CMakeLists.txt 11 Oct 2007 16:18:14 -0000 1.13 @@ -86,6 +86,21 @@ SET(VTK_CLASS_WRAP_EXCLUDE_vtkLongLongArray 1) SET(VTK_CLASS_WRAP_EXCLUDE_vtkSignedCharArray 1) SET(VTK_CLASS_WRAP_EXCLUDE_vtkUnsignedLongLongArray 1) + # Mac OS X will not compile these as well. Will exclude until a better solution is determined + IF(APPLE) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkStreamTracer 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkTensorGlyph 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkDEMReader 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkTIFFWriter 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkCameraInterpolator 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkQuaternionInterpolator 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkTransformInterpolator 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkProjectedTerrainPath 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkImagePlaneWidget 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkDistributedStreamTracer 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkPStreamTracer 1) + ENDIF(APPLE) + # SET(all_oct) # FOREACH(class ${VTK_${ukit}_CLASSES}) |
|
From: Jonathan S. <jjs...@us...> - 2007-10-11 14:36:55
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32654 Modified Files: vtk_contour.m Log Message: turn off Z axis in contour plots Index: vtk_contour.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_contour.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtk_contour.m 25 Dec 2006 20:12:50 -0000 1.2 +++ vtk_contour.m 11 Oct 2007 14:36:57 -0000 1.3 @@ -134,7 +134,7 @@ f = vtk_figure(0); f.renderer.AddActor(contActor); - %f.axes.YAxisVisibilityOff(); # turn off the "Z" axes (but use YAxis command!?) - must be a bug, JJS 7/23/05 + f.axes.YAxisVisibilityOff(); % turn off the "Z" axes (but use YAxis command!? is this a bug?) vtk_update(f); endfunction |
|
From: Thomas W. <tho...@us...> - 2007-10-11 07:34:54
|
Update of /cvsroot/octaviz/octaviz/Examples In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26051/Examples Modified Files: CMakeLists.txt Log Message: Unify configuration calls to octave-config and mkoctfile Variables are named like the variables in octave-config and mkoctfile calls, respectively. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Examples/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CMakeLists.txt 17 Jan 2007 21:18:53 -0000 1.2 +++ CMakeLists.txt 11 Oct 2007 07:34:53 -0000 1.3 @@ -1,15 +1,4 @@ -EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--m-site-dir" OUTPUT_VARIABLE M_INST_DIR_EXEC) -# Remove prefix from scripts install dir -STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" M_INST_DIR ${M_INST_DIR_EXEC}) - -EXEC_PROGRAM("pwd" OUTPUT_VARIABLE CURRENT_DIR_EXEC) -IF(CURRENT_DIR_EXEC MATCHES "Examples") - SET(CURR_DIR "") -ELSE(CURRENT_DIR_EXEC MATCHES "Examples") - SET(CURR_DIR "Examples") -ENDIF(CURRENT_DIR_EXEC MATCHES "Examples") - EXEC_PROGRAM("ls" ${CURR_DIR} ARGS "*.m" OUTPUT_VARIABLE EXAMPLE_SCRIPTS_EXEC) STRING(REGEX MATCHALL "[^\n]+" EXAMPLE_SCRIPTS ${EXAMPLE_SCRIPTS_EXEC}) -INSTALL_PROGRAMS(${M_INST_DIR}/octaviz/Examples ${EXAMPLE_SCRIPTS}) +INSTALL_PROGRAMS(${OCTAVIZ_EXAMPLES_DIR} ${EXAMPLE_SCRIPTS}) |
|
From: Thomas W. <tho...@us...> - 2007-10-11 07:34:54
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26051/Scripts Modified Files: CMakeLists.txt Log Message: Unify configuration calls to octave-config and mkoctfile Variables are named like the variables in octave-config and mkoctfile calls, respectively. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/CMakeLists.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- CMakeLists.txt 17 Jan 2007 21:18:53 -0000 1.3 +++ CMakeLists.txt 11 Oct 2007 07:34:53 -0000 1.4 @@ -1,19 +1,8 @@ -EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--m-site-dir" OUTPUT_VARIABLE M_INST_DIR_EXEC) -# Remove prefix from scripts install dir -STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" M_INST_DIR ${M_INST_DIR_EXEC}) - # Insert VTK_DATA_ROOT given to cmake into vtkGetDataRoot.m CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtkGetDataRoot.m ${CMAKE_CURRENT_BINARY_DIR}/vtkGetDataRoot.m) -EXEC_PROGRAM("pwd" OUTPUT_VARIABLE CURRENT_DIR_EXEC) -IF(CURRENT_DIR_EXEC MATCHES "Scripts") - SET(CURR_DIR "") -ELSE(CURRENT_DIR_EXEC MATCHES "Scripts") - SET(CURR_DIR "Scripts") -ENDIF(CURRENT_DIR_EXEC MATCHES "Scripts") - EXEC_PROGRAM("ls" ${CURR_DIR} ARGS "*.m" OUTPUT_VARIABLE M_SCRIPTS_EXEC) STRING(REGEX MATCHALL "[^\n]+" M_SCRIPTS ${M_SCRIPTS_EXEC}) -INSTALL_PROGRAMS(${M_INST_DIR}/octaviz ${M_SCRIPTS}) +INSTALL_PROGRAMS(${OCTAVIZ_M_DIR} ${M_SCRIPTS}) |
|
From: Thomas W. <tho...@us...> - 2007-10-11 07:34:54
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26051 Modified Files: CMakeLists.txt Log Message: Unify configuration calls to octave-config and mkoctfile Variables are named like the variables in octave-config and mkoctfile calls, respectively. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- CMakeLists.txt 8 Oct 2007 06:25:39 -0000 1.11 +++ CMakeLists.txt 11 Oct 2007 07:34:53 -0000 1.12 @@ -35,25 +35,31 @@ ENDIF(NOT X11_FOUND) LINK_LIBRARIES(${X11_LIBRARIES} Xt) -# find octave-config +# find octave-config and get variables from it FIND_PROGRAM(OCTAVE_CONFIG octave-config) IF(NOT OCTAVE_CONFIG) - MESSAGE(FATAL_ERROR "Octave is required. Please install Octave and rerun cmake.") + MESSAGE(FATAL_ERROR "Octave is required, but octave-config was not found. Please install Octave and rerun cmake.") ENDIF(NOT OCTAVE_CONFIG) -# Set prefix from octave prefix -EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p PREFIX" OUTPUT_VARIABLE OCT_PREFIX_EXEC) +EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--oct-site-dir" OUTPUT_VARIABLE OCT_SITE_DIR) +EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--m-site-dir" OUTPUT_VARIABLE M_SITE_DIR) +EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTINCLUDEDIR" OUTPUT_VARIABLE OCTINCLUDEDIR) +EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCTLIBDIR) + -# check to see if OCT_PREFIX_EXEC is unset -# unset variables match exactly the name of the variable -IF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") -ELSE(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") - # if OCT_PREFIX_EXEC has a value then cache the value - # so that OCT_PREFIX can be seen in all sub directories of - # the project - SET(OCT_PREFIX ${OCT_PREFIX_EXEC} CACHE INTERNAL "" FORCE) -ENDIF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$") -SET(CMAKE_INSTALL_PREFIX ${OCT_PREFIX} CACHE PATH "Specifies the directory where .oct files will be installed." FORCE) +FIND_PROGRAM(MKOCTFILE mkoctfile) +IF(NOT MKOCTFILE) + MESSAGE(FATAL_ERROR "mkoctfile was not found. If you installed Octave from a distribution package, please check if there are any devel packages for it (normally named '-dev' or '-devel')") +ENDIF(NOT MKOCTFILE) +EXEC_PROGRAM(${MKOCTFILE} ARGS "-p ALL_CXXFLAGS" OUTPUT_VARIABLE ALL_CXXFLAGS) + +# Make the values accessible from other CMakeLists.txt files +# Also, this allows packagers to override the default values +SET(OCTAVIZ_OCT_DIR ${OCT_SITE_DIR}/octaviz CACHE PATH ".oct files from Octaviz") +SET(OCTAVIZ_M_DIR ${M_SITE_DIR}/octaviz CACHE PATH ".m files from Octaviz") +SET(OCTAVIZ_EXAMPLES_DIR ${OCTAVIZ_M_DIR}/Examples CACHE PATH "Example .m files from Octaviz") +SET(OCTAVIZ_SHARED_DIR ${OCTLIBDIR} CACHE PATH "shared libraries from Octaviz") +SET(ALL_CXXFLAGS ${ALL_CXXFLAGS} CACHE STRING "ALL_CXXFLAGS from mkoctfile") # Build the vtkOctave wrapping utility first. ADD_SUBDIRECTORY(Wrapping) |
|
From: Thomas W. <tho...@us...> - 2007-10-11 07:34:54
|
Update of /cvsroot/octaviz/octaviz/Common In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26051/Common Modified Files: CMakeLists.txt Log Message: Unify configuration calls to octave-config and mkoctfile Variables are named like the variables in octave-config and mkoctfile calls, respectively. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/CMakeLists.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- CMakeLists.txt 8 Oct 2007 06:25:39 -0000 1.8 +++ CMakeLists.txt 11 Oct 2007 07:34:53 -0000 1.9 @@ -3,11 +3,9 @@ ADD_LIBRARY( octaviz SHARED octaviz.cc ) OCTAVE_WRAP_VTK(Common "${KIT_WRAP_DEPS}") -EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTINCLUDEDIR" OUTPUT_VARIABLE OCT_INC_DIR) -EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR) -INCLUDE_DIRECTORIES(${OCT_INC_DIR} "${OCT_INC_DIR}/octave" ) +INCLUDE_DIRECTORIES(${OCTINCLUDEDIR} "${OCTINCLUDEDIR}/octave" ) LINK_LIBRARIES(octinterp octave cruft vtkCommon) -LINK_DIRECTORIES(${OCT_LIB_DIR}) +LINK_DIRECTORIES(${OCTLIBDIR}) ADD_CUSTOM_COMMAND( OUTPUT vtk_init.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_init.cc ) ADD_CUSTOM_COMMAND( OUTPUT vtkInitializeInteractor.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtkInitializeInteractor.cc) @@ -19,15 +17,11 @@ #ADD_CUSTOM_TARGET(vtkWindow.oct ALL mkoctfile ${oct_flags} ${oct_link_flags} vtkWindow.cc) -# Get octave lib install directory -EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR) INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkInitializeInteractor.oct vtk_init.oct vtkRaiseWindow.oct vtk_get_pointer.oct vtk_print_ref_table.oct) INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct}) #MESSAGE(${all_oct}) -# Get octave lib install directory -EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR) # Remove prefix from octave lib install dir -STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OUT_MTCH ${OCT_LIB_DIR}) +STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OUT_MTCH ${OCTLIBDIR}) INSTALL_TARGETS(${OUT_MTCH} octaviz) |
|
From: Thomas W. <tho...@us...> - 2007-10-08 06:25:47
|
Update of /cvsroot/octaviz/octaviz/Graphics In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7907/Graphics Modified Files: CMakeLists.txt Log Message: Simplify interface of OCTAVE_WRAP_VTK Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Graphics/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CMakeLists.txt 25 Dec 2006 20:12:50 -0000 1.2 +++ CMakeLists.txt 8 Oct 2007 06:25:39 -0000 1.3 @@ -1,5 +1,5 @@ SET( KIT_WRAP_DEPS Filtering ) -OCTAVE_WRAP_VTK( Graphics GRAPHICS "${KIT_WRAP_DEPS}") +OCTAVE_WRAP_VTK( Graphics "${KIT_WRAP_DEPS}") ADD_CUSTOM_TARGET( Graphics ALL COMMAND touch Graphics DEPENDS ${all_oct} ) INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct}) -#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkGraphics.oct) \ No newline at end of file +#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkGraphics.oct) |
|
From: Thomas W. <tho...@us...> - 2007-10-08 06:25:41
|
Update of /cvsroot/octaviz/octaviz/Filtering In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7907/Filtering Modified Files: CMakeLists.txt Log Message: Simplify interface of OCTAVE_WRAP_VTK Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Filtering/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CMakeLists.txt 25 Dec 2006 20:12:50 -0000 1.2 +++ CMakeLists.txt 8 Oct 2007 06:25:39 -0000 1.3 @@ -1,5 +1,5 @@ SET( KIT_WRAP_DEPS Common ) -OCTAVE_WRAP_VTK( Filtering FILTERING "${KIT_WRAP_DEPS}") +OCTAVE_WRAP_VTK( Filtering "${KIT_WRAP_DEPS}") ADD_CUSTOM_TARGET( Filtering ALL COMMAND touch Filtering DEPENDS ${all_oct} ) INSTALL_PROGRAMS( ${OCT_INST_DIR}/octaviz ${all_oct} ) #INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkFiltering.oct) |
|
From: Thomas W. <tho...@us...> - 2007-10-08 06:25:40
|
Update of /cvsroot/octaviz/octaviz/Common In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7907/Common Modified Files: CMakeLists.txt Log Message: Simplify interface of OCTAVE_WRAP_VTK Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/CMakeLists.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- CMakeLists.txt 17 Jan 2007 21:18:53 -0000 1.7 +++ CMakeLists.txt 8 Oct 2007 06:25:39 -0000 1.8 @@ -2,7 +2,7 @@ ADD_LIBRARY( octaviz SHARED octaviz.cc ) -OCTAVE_WRAP_VTK(Common COMMON "${KIT_WRAP_DEPS}") +OCTAVE_WRAP_VTK(Common "${KIT_WRAP_DEPS}") EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTINCLUDEDIR" OUTPUT_VARIABLE OCT_INC_DIR) EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR) INCLUDE_DIRECTORIES(${OCT_INC_DIR} "${OCT_INC_DIR}/octave" ) |
|
From: Thomas W. <tho...@us...> - 2007-10-08 06:25:38
|
Update of /cvsroot/octaviz/octaviz/Hybrid In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7907/Hybrid Modified Files: CMakeLists.txt Log Message: Simplify interface of OCTAVE_WRAP_VTK Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Hybrid/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CMakeLists.txt 25 Dec 2006 20:12:50 -0000 1.2 +++ CMakeLists.txt 8 Oct 2007 06:25:40 -0000 1.3 @@ -1,5 +1,5 @@ SET( KIT_WRAP_DEPS Rendering ) -OCTAVE_WRAP_VTK( Hybrid HYBRID "${KIT_WRAP_DEPS}") +OCTAVE_WRAP_VTK( Hybrid "${KIT_WRAP_DEPS}") ADD_CUSTOM_TARGET( Hybrid ALL COMMAND touch Hybrid DEPENDS ${all_oct} ) INSTALL_PROGRAMS( ${OCT_INST_DIR}/octaviz ${all_oct} ) -#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkHybrid.oct) \ No newline at end of file +#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkHybrid.oct) |
|
From: Thomas W. <tho...@us...> - 2007-10-08 06:25:38
|
Update of /cvsroot/octaviz/octaviz/Imaging In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7907/Imaging Modified Files: CMakeLists.txt Log Message: Simplify interface of OCTAVE_WRAP_VTK Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Imaging/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CMakeLists.txt 25 Dec 2006 20:12:50 -0000 1.2 +++ CMakeLists.txt 8 Oct 2007 06:25:40 -0000 1.3 @@ -1,5 +1,5 @@ SET( KIT_WRAP_DEPS Filtering ) -OCTAVE_WRAP_VTK( Imaging IMAGING "${KIT_WRAP_DEPS}") +OCTAVE_WRAP_VTK( Imaging "${KIT_WRAP_DEPS}") ADD_CUSTOM_TARGET( Imaging ALL COMMAND touch Imaging DEPENDS ${all_oct} ) INSTALL_PROGRAMS( ${OCT_INST_DIR}/octaviz ${all_oct} ) -#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkImaging.oct) \ No newline at end of file +#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkImaging.oct) |
|
From: Thomas W. <tho...@us...> - 2007-10-08 06:25:38
|
Update of /cvsroot/octaviz/octaviz/Rendering In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7907/Rendering Modified Files: CMakeLists.txt Log Message: Simplify interface of OCTAVE_WRAP_VTK Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Rendering/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CMakeLists.txt 25 Dec 2006 20:12:50 -0000 1.2 +++ CMakeLists.txt 8 Oct 2007 06:25:40 -0000 1.3 @@ -1,5 +1,5 @@ SET(KIT_WRAP_DEPS Graphics Imaging IO) -OCTAVE_WRAP_VTK( Rendering RENDERING "${KIT_WRAP_DEPS}" ) +OCTAVE_WRAP_VTK( Rendering "${KIT_WRAP_DEPS}" ) ADD_CUSTOM_TARGET( Rendering ALL COMMAND touch Rendering DEPENDS ${all_oct} ) INSTALL_PROGRAMS( ${OCT_INST_DIR}/octaviz ${all_oct} ) -#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkRendering.oct) \ No newline at end of file +#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkRendering.oct) |
|
From: Thomas W. <tho...@us...> - 2007-10-08 06:25:38
|
Update of /cvsroot/octaviz/octaviz/Patented In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7907/Patented Modified Files: CMakeLists.txt Log Message: Simplify interface of OCTAVE_WRAP_VTK Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Patented/CMakeLists.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CMakeLists.txt 21 Sep 2004 22:50:38 -0000 1.1.1.1 +++ CMakeLists.txt 8 Oct 2007 06:25:40 -0000 1.2 @@ -1,4 +1,4 @@ SET(KIT_WRAP_DEPS Rendering) -OCTAVE_WRAP_VTK(Patented PATENTED "${KIT_WRAP_DEPS}") +OCTAVE_WRAP_VTK(Patented "${KIT_WRAP_DEPS}") INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct}) -#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkPatented.oct) \ No newline at end of file +#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkPatented.oct) |
|
From: Thomas W. <tho...@us...> - 2007-10-08 06:25:38
|
Update of /cvsroot/octaviz/octaviz/IO In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7907/IO Modified Files: CMakeLists.txt Log Message: Simplify interface of OCTAVE_WRAP_VTK Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/IO/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CMakeLists.txt 25 Dec 2006 20:12:50 -0000 1.2 +++ CMakeLists.txt 8 Oct 2007 06:25:40 -0000 1.3 @@ -1,5 +1,5 @@ SET( KIT_WRAP_DEPS Filtering ) -OCTAVE_WRAP_VTK( IO IO "${KIT_WRAP_DEPS}") +OCTAVE_WRAP_VTK( IO "${KIT_WRAP_DEPS}") ADD_CUSTOM_TARGET( IO ALL COMMAND touch IO DEPENDS ${all_oct} ) INSTALL_PROGRAMS( ${OCT_INST_DIR}/octaviz ${all_oct} ) #INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkIO.oct) |
|
From: Thomas W. <tho...@us...> - 2007-10-08 06:25:38
|
Update of /cvsroot/octaviz/octaviz/Parallel In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7907/Parallel Modified Files: CMakeLists.txt Log Message: Simplify interface of OCTAVE_WRAP_VTK Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Parallel/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CMakeLists.txt 25 Dec 2006 20:12:50 -0000 1.2 +++ CMakeLists.txt 8 Oct 2007 06:25:40 -0000 1.3 @@ -1,5 +1,5 @@ SET( KIT_WRAP_DEPS Rendering ) -OCTAVE_WRAP_VTK( Parallel PARALLEL "${KIT_WRAP_DEPS}") +OCTAVE_WRAP_VTK( Parallel "${KIT_WRAP_DEPS}") ADD_CUSTOM_TARGET( Parallel ALL COMMAND touch Parallel DEPENDS ${all_oct} ) INSTALL_PROGRAMS( ${OCT_INST_DIR}/octaviz ${all_oct} ) #INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkRendering.oct) |
