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: Jonathan S. <jjs...@us...> - 2010-02-03 16:10:45
|
Update of /cvsroot/octaviz/octaviz/Wrapping In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22427/Wrapping Modified Files: lex.yy.c vtkParse.l vtkParse.tab.c vtkParse.y vtkWrapOctave.c Added Files: y.tab.c Log Message: attempt to get octaviz working with vtk-5.2, courtesy of Andreas Potschka Index: vtkParse.y =================================================================== RCS file: /cvsroot/octaviz/octaviz/Wrapping/vtkParse.y,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtkParse.y 1 Mar 2005 02:13:29 -0000 1.2 +++ vtkParse.y 3 Feb 2010 16:10:37 -0000 1.3 @@ -196,6 +196,7 @@ %token ViewportCoordinateMacro %token WorldCoordinateMacro %token TypeMacro +%token ExportedTypeRevisionMacro %% /* @@ -310,7 +311,7 @@ static_mod: STATIC {postSig("static ");}; -any_id: VTK_ID {postSig($<str>1);} | ID {postSig($<str>1);}; +any_id: VTK_ID { postSig($<str>1);} | ID {postSig($<str>1);}; func_body: ';' | '{' maybe_other '}' ';' @@ -319,7 +320,7 @@ args_list: | more_args; -more_args: arg { currentFunction->NumberOfArguments++;} +more_args: arg { currentFunction->NumberOfArguments++; } | arg { currentFunction->NumberOfArguments++; postSig(", ");} ',' more_args; arg: type @@ -409,8 +410,7 @@ /* store the string into the return value just in case we need it */ /* this is a parsing hack because the first "type" parser will */ /* possibly be ht ereturn type of the first argument */ - if ((!currentFunction->ReturnClass) && - (!currentFunction->NumberOfArguments)) + if ((!currentFunction->ReturnClass) && (!currentFunction->NumberOfArguments)) { currentFunction->ReturnClass = vtkstrdup($1); } @@ -419,12 +419,12 @@ optional_scope: | ':' scope_list; scope_list: scope_type VTK_ID - { + { data.SuperClasses[data.NumberOfSuperClasses] = vtkstrdup($2); data.NumberOfSuperClasses++; } | scope_type VTK_ID - { + { data.SuperClasses[data.NumberOfSuperClasses] = vtkstrdup($2); data.NumberOfSuperClasses++; } ',' scope_list; @@ -485,6 +485,8 @@ {postSig(");"); openSig = 0;} ',' maybe_other_no_semi ')' { char *local = vtkstrdup(currentFunction->Signature); + char *savedReturnClass = NULL; + if (currentFunction->ReturnClass) savedReturnClass = vtkstrdup(currentFunction->ReturnClass); sscanf (currentFunction->Signature, "%*s %*s (%s);", local); sprintf(temps,"Set%s",$<str>3); currentFunction->Name = vtkstrdup(temps); @@ -501,6 +503,7 @@ currentFunction->Name = vtkstrdup(temps); currentFunction->NumberOfArguments = 0; currentFunction->ReturnType = $<integer>6; + currentFunction->ReturnClass = savedReturnClass; output_function(); currentFunction->Signature = (char *)malloc(2048); @@ -510,6 +513,7 @@ currentFunction->Name = vtkstrdup(temps); currentFunction->NumberOfArguments = 0; currentFunction->ReturnType = $<integer>6; + currentFunction->ReturnClass = savedReturnClass; output_function(); } | SetObjectMacro '(' any_id ',' @@ -946,6 +950,57 @@ output_function(); } } +| ExportedTypeRevisionMacro '(' any_id ',' any_id ',' ')' + { + currentFunction->Signature = (char *)malloc(2048); + sigAllocatedLength = 2048; + sprintf(currentFunction->Signature, "const char *GetClassName ();"); + sprintf(temps,"GetClassName"); + currentFunction->Name = vtkstrdup(temps); + currentFunction->NumberOfArguments = 0; + currentFunction->ReturnType = 1303; + output_function(); + + currentFunction->Signature = (char *)malloc(2048); + sigAllocatedLength = 2048; + sprintf(currentFunction->Signature, + "int IsA (const char *name);"); + sprintf(temps,"IsA"); + currentFunction->Name = vtkstrdup(temps); + currentFunction->NumberOfArguments = 1; + currentFunction->ArgTypes[0] = 1303; + currentFunction->ArgCounts[0] = 0; + currentFunction->ReturnType = 4; + output_function(); + + currentFunction->Signature = (char *)malloc(2048); + sigAllocatedLength = 2048; + sprintf(currentFunction->Signature, "%s *NewInstance ();", + $<str>3); + sprintf(temps,"NewInstance"); + currentFunction->Name = vtkstrdup(temps); + currentFunction->NumberOfArguments = 0; + currentFunction->ReturnType = 309; + currentFunction->ReturnClass = vtkstrdup($<str>3); + output_function(); + + if ( data.IsConcrete ) + { + currentFunction->Signature = (char *)malloc(2048); + sigAllocatedLength = 2048; + sprintf(currentFunction->Signature, "%s *SafeDownCast (vtkObject* o);", + $<str>3); + sprintf(temps,"SafeDownCast"); + currentFunction->Name = vtkstrdup(temps); + currentFunction->NumberOfArguments = 1; + currentFunction->ArgTypes[0] = 309; + currentFunction->ArgCounts[0] = 1; + currentFunction->ArgClasses[0] = vtkstrdup("vtkObject"); + currentFunction->ReturnType = 2309; + currentFunction->ReturnClass = vtkstrdup($<str>3); + output_function(); + } + } ; /* @@ -1151,8 +1206,8 @@ if (ret) { fprintf(stdout, - "*** SYNTAX ERROR found in parsing the header file %s before line %d ***\n", - argv[1], yylineno); + "*** SYNTAX ERROR found in parsing the header file %s before line %d: '%s\' ***\n", + argv[1], yylineno, yytext); return ret; } Index: vtkWrapOctave.c =================================================================== RCS file: /cvsroot/octaviz/octaviz/Wrapping/vtkWrapOctave.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- vtkWrapOctave.c 23 Oct 2006 01:01:33 -0000 1.5 +++ vtkWrapOctave.c 3 Feb 2010 16:10:37 -0000 1.6 @@ -175,6 +175,9 @@ } fprintf(fp," retval = tempResult;\n"); break; + default: + fprintf(stderr, "Warning (use_hints): unknown return type %d.\n", currentFunction->ReturnType); + break; } } @@ -358,17 +361,30 @@ break; case 109: case 309: - fprintf(fp," if ( args(%i).type_id() != vtk_object::static_type_id() ) error_flag = 1;\n",start_arg); + if ( currentFunction->ArgCounts[i] <= 1 ) + { + fprintf(fp," if ( args(%i).type_id() != vtk_object::static_type_id() ) error_flag = 1;\n",start_arg); # if __WORDSIZE == 64 - fprintf(fp," else temp%i = reinterpret_cast<%s*>( args(%i).uint64_scalar_value().value() );\n",i,currentFunction->ArgClasses[i],start_arg); + fprintf(fp," else temp%i = reinterpret_cast<%s*>( args(%i).uint64_scalar_value().value() );\n",i,currentFunction->ArgClasses[i],start_arg); # else - fprintf(fp," else temp%i = reinterpret_cast<%s*>( args(%i).uint32_scalar_value().value() );\n",i,currentFunction->ArgClasses[i],start_arg); + fprintf(fp," else temp%i = reinterpret_cast<%s*>( args(%i).uint32_scalar_value().value() );\n",i,currentFunction->ArgClasses[i],start_arg); # endif - /* FIXME - fprintf(fp," retval = octave_value( new vtk_object(temp%i) );\n",MAX_ARGS); - fprintf(fp," 309temp%i = (%s *)(vtkTclGetPointerFromObject(argv[%i],(char *) \"%s\",interp,error_flag));\n",i,currentFunction->ArgClasses[i],start_arg, - currentFunction->ArgClasses[i]); - */ + /* FIXME + fprintf(fp," retval = octave_value( new vtk_object(temp%i) );\n",MAX_ARGS); + fprintf(fp," 309temp%i = (%s *)(vtkTclGetPointerFromObject(argv[%i],(char *) \"%s\",interp,error_flag));\n",i,currentFunction->ArgClasses[i],start_arg, + currentFunction->ArgClasses[i]); + */ + } + else + { + fprintf(fp," if ( ( args(%i).rows()*args(%i).columns() != %i ) ) error_flag = 1;\n",start_arg,start_arg,currentFunction->ArgCounts[i]); + /* now allocate the array and copy octave vector */ + fprintf(fp," else \n {\n"); + fprintf(fp," Array<double> vect = args(%i).vector_value();\n",start_arg); + fprintf(fp," int length = args(%i).length();\n",start_arg); + fprintf(fp," if ( length != %d ) error_flag = 1;\n",currentFunction->ArgCounts[i]); + fprintf(fp," else for ( int k = 0; k < length; k++ ) temp%i[k] = (%s)vect(k);\n }\n",i,currentFunction->ArgClasses[i]); + } break; case 2: case 9: @@ -643,6 +659,7 @@ while ( data->Description[i] != 0 ) { if ( data->Description[i] == '"' ) fprintf(fp,"\\"); + if ( data->Description[i] == '\\' ) fprintf(fp,"\\"); /* Curly braces are special characters in Texinfo. Quote them. */ if ( data->Description[i] == '{' || data->Description[i] == '}' ) --- NEW FILE: y.tab.c --- /* A Bison parser, made by GNU Bison 2.4.1. */ /* Skeleton implementation for Bison's Yacc-like parsers in C Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License [...3605 lines suppressed...] } else { fout = fopen(argv[3],"w"); data.OutputFileName = argv[3]; } if (!fout) { fprintf(stderr,"Error opening output file %s\n",argv[3]); exit(1); } vtkParseOutput(fout,&data); fclose (fout); return 0; } Index: vtkParse.tab.c =================================================================== RCS file: /cvsroot/octaviz/octaviz/Wrapping/vtkParse.tab.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtkParse.tab.c 1 Mar 2005 02:53:06 -0000 1.3 +++ vtkParse.tab.c 3 Feb 2010 16:10:37 -0000 1.4 @@ -1,30 +1,39 @@ -/* A Bison parser, made by GNU Bison 1.875d. */ -/* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +/* A Bison parser, made by GNU Bison 2.4.1. */ - This program is free software; you can redistribute it and/or modify +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. [...4232 lines suppressed...] +#line 1022 "vtkParse.y" #include <string.h> #include "lex.yy.c" @@ -3054,8 +3632,8 @@ if (ret) { fprintf(stdout, - "*** SYNTAX ERROR found in parsing the header file %s before line %d ***\n", - argv[1], yylineno); + "*** SYNTAX ERROR found in parsing the header file %s before line %d: '%s\' ***\n", + argv[1], yylineno, yytext); return ret; } @@ -3083,4 +3661,3 @@ - Index: vtkParse.l =================================================================== RCS file: /cvsroot/octaviz/octaviz/Wrapping/vtkParse.l,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtkParse.l 1 Mar 2005 02:53:06 -0000 1.3 +++ vtkParse.l 3 Feb 2010 16:10:37 -0000 1.4 @@ -176,7 +176,6 @@ "static" return(STATIC); "vtkFloatingPointType" return(DOUBLE); -"vtkIdType" return(INT); "vtkSetMacro" return(SetMacro); "vtkGetMacro" return(GetMacro); "vtkSetStringMacro" return(SetStringMacro); @@ -200,6 +199,7 @@ "vtkWorldCoordinateMacro" return(WorldCoordinateMacro); "vtkTypeMacro" return(TypeMacro); "vtkTypeRevisionMacro" return(TypeMacro); +"vtkExportedTypeRevisionMacro" return(ExportedTypeRevisionMacro); "VTK_LEGACY" return(VTK_LEGACY); [0-9]+ { sscanf(yytext,"%d",&yylval.integer); return(NUM);} Index: lex.yy.c =================================================================== RCS file: /cvsroot/octaviz/octaviz/Wrapping/lex.yy.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- lex.yy.c 1 Mar 2005 02:53:06 -0000 1.3 +++ lex.yy.c 3 Feb 2010 16:10:37 -0000 1.4 @@ -8,7 +8,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 31 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -30,7 +30,15 @@ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ [...1332 lines suppressed...] return n; @@ -2628,18 +2739,6 @@ #define YYTABLES_NAME "yytables" -#undef YY_NEW_FILE -#undef YY_FLUSH_BUFFER -#undef yy_set_bol -#undef yy_new_buffer -#undef yy_set_interactive -#undef yytext_ptr -#undef YY_DO_BEFORE_ACTION - -#ifdef YY_DECL_IS_OURS -#undef YY_DECL_IS_OURS -#undef YY_DECL -#endif #line 238 "vtkParse.l" |
From: Jonathan S. <jjs...@us...> - 2010-02-03 16:10:45
|
Update of /cvsroot/octaviz/octaviz/Common In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22427/Common Modified Files: OctavizCommon.h octaviz.h vtkInitializeInteractor.cc Log Message: attempt to get octaviz working with vtk-5.2, courtesy of Andreas Potschka Index: OctavizCommon.h =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/OctavizCommon.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- OctavizCommon.h 1 Mar 2005 02:55:53 -0000 1.3 +++ OctavizCommon.h 3 Feb 2010 16:10:36 -0000 1.4 @@ -3,12 +3,19 @@ #include <string> #include <map> #include "octaviz.h" +#include "tcl.h" #ifdef None #undef None #endif #ifdef CurrentTime #undef CurrentTime #endif +#ifdef CursorShape + #undef CursorShape +#endif +#ifdef AnyModifier + #undef AnyModifier +#endif - +Tcl_Interp *interp = 0; // Where can I get a Tcl_Interp? Index: vtkInitializeInteractor.cc =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/vtkInitializeInteractor.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- vtkInitializeInteractor.cc 12 Jan 2007 08:12:41 -0000 1.5 +++ vtkInitializeInteractor.cc 3 Feb 2010 16:10:37 -0000 1.6 @@ -17,18 +17,18 @@ ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <vtkXRenderWindowInteractor.h> -#include <vtkXOpenGLRenderWindow.h> -#include <vtkCommand.h> -#include <vtkCallbackCommand.h> +#include "vtkXRenderWindowInteractor.h" +#include "vtkXOpenGLRenderWindow.h" +#include "vtkCommand.h" +#include "vtkCallbackCommand.h" #undef Complex -#include <octave/oct.h> +#include "octave/oct.h" vtkCallbackCommand* InteractorExitCallbackCommand = NULL; // The following must be defined for recent versions of Octave. #define TYPEID_HAS_CLASS -#include <octave/oct.h> +#include "octave/oct.h" #include "octaviz.h" Index: octaviz.h =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/octaviz.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- octaviz.h 11 Mar 2005 00:59:54 -0000 1.4 +++ octaviz.h 3 Feb 2010 16:10:37 -0000 1.5 @@ -49,6 +49,8 @@ #include <X11/Xlib.h> #include <X11/Intrinsic.h> +#include "vtkCommand.h" + extern XtAppContext vtk_app_context; extern std::map<Atom, unsigned int> vtk_delete_window_atoms; @@ -116,8 +118,6 @@ DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; -#include "vtkCommand.h" - // Allow Octave to use the vtkCommand features class vtkOctaveCommand : public vtkCommand |
From: Jonathan S. <jjs...@us...> - 2010-02-03 16:10:45
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22427/Scripts Modified Files: vtk_imshow.m vtk_trisurf.m Log Message: attempt to get octaviz working with vtk-5.2, courtesy of Andreas Potschka Index: vtk_trisurf.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_trisurf.m,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- vtk_trisurf.m 6 Sep 2008 12:35:34 -0000 1.12 +++ vtk_trisurf.m 3 Feb 2010 16:10:37 -0000 1.13 @@ -117,10 +117,6 @@ end pts = [x y z]; end - - if (find(isnan(pts)) || find(isnan(t))) - error("Sorry, NaN values are not supported in VTK\n"); - endif vtk_init; Index: vtk_imshow.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_imshow.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtk_imshow.m 23 Jul 2008 19:36:02 -0000 1.3 +++ vtk_imshow.m 3 Feb 2010 16:10:37 -0000 1.4 @@ -30,7 +30,7 @@ error('Input matrix has to be NxM or NxMx3.'); end - [nr nc nl] = size(a); + [nr nc] = size(a); if ( ndims(a) == 2 ) ncomp = 1; @@ -39,9 +39,6 @@ if ( ndims(a) == 3 ) ncomp = 3; - if (nl~=3) - error('third dimension must be have a length of 3') - endif len = nr*nc*3; image = zeros(len,1); image(1:3:len) = a(:,:,1); |
From: Jonathan S. <jjs...@us...> - 2010-02-03 16:03:05
|
Update of /cvsroot/octaviz/octaviz In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21645 Modified Files: CMakeLists.txt Log Message: attempt to get octaviz working with vtk-5.2, courtesy of Andreas Potschka Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- CMakeLists.txt 14 Mar 2008 14:12:17 -0000 1.19 +++ CMakeLists.txt 3 Feb 2010 16:02:55 -0000 1.20 @@ -3,6 +3,8 @@ PROJECT(OCTAVIZ) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + ## added from cmake FAQ, JJS 3/29/05; also needs the file cmake_uninstall.cmake.in ## currently not working (vtkGetDataRoot.m is showing up in the install_manifest.txt file twice) ## see the README for alternate uninstall method, JJS 3/14/08 @@ -34,6 +36,11 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/local/lib/vtk /usr/lib/vtk) +FIND_PACKAGE(TCL) +IF(NOT TCL_FOUND) + MESSAGE(FATAL_ERROR "TCL is required. Please set TCL_DIR.") +ENDIF(NOT TCL_FOUND) + FIND_PACKAGE(VTK) IF(NOT VTK_FOUND) MESSAGE(FATAL_ERROR "VTK is required. Please set VTK_DIR.") @@ -123,7 +130,7 @@ # There are some header files in the Common/ directory that we need # Add binary directory before source directory for the precompiled headers - SET(INCLUDE_FLAGS -I${VTK_${ukit}_HEADER_DIR} -I${CMAKE_BINARY_DIR}/Common -I${CMAKE_SOURCE_DIR}/Common) + SET(INCLUDE_FLAGS -I${TCL_INCLUDE_PATH} -I${VTK_${ukit}_HEADER_DIR} -I${CMAKE_BINARY_DIR}/Common -I${CMAKE_SOURCE_DIR}/Common) SET(LINK_FLAGS -L${X11_LIBRARY_DIR} -lX11 -lXt -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering -lvtkGraphics -L${CMAKE_BINARY_DIR}/Common -loctaviz) |
From: Thomas W. <tho...@us...> - 2008-09-06 12:35:25
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15949/Scripts Modified Files: vtk_trisurf.m Log Message: VTK doesn't handle NaNs, so error out before calling .oct files (avoids a crash in Octave) This was Debian bug #480431, http://bugs.debian.org/480431 Index: vtk_trisurf.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_trisurf.m,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- vtk_trisurf.m 27 Jan 2007 22:50:38 -0000 1.11 +++ vtk_trisurf.m 6 Sep 2008 12:35:34 -0000 1.12 @@ -117,6 +117,10 @@ end pts = [x y z]; end + + if (find(isnan(pts)) || find(isnan(t))) + error("Sorry, NaN values are not supported in VTK\n"); + endif vtk_init; |
From: Jonathan S. <jjs...@us...> - 2008-07-23 19:36:15
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21883 Modified Files: vtk_imshow.m Log Message: fixed bug in vtk_imshow Index: vtk_imshow.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_imshow.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtk_imshow.m 23 Oct 2004 18:47:58 -0000 1.2 +++ vtk_imshow.m 23 Jul 2008 19:36:02 -0000 1.3 @@ -30,7 +30,7 @@ error('Input matrix has to be NxM or NxMx3.'); end - [nr nc] = size(a); + [nr nc nl] = size(a); if ( ndims(a) == 2 ) ncomp = 1; @@ -39,6 +39,9 @@ if ( ndims(a) == 3 ) ncomp = 3; + if (nl~=3) + error('third dimension must be have a length of 3') + endif len = nr*nc*3; image = zeros(len,1); image(1:3:len) = a(:,:,1); |
From: Jonathan S. <jjs...@us...> - 2008-03-14 14:12:23
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18853 Modified Files: CMakeLists.txt README Added Files: TODO Log Message: added uninstall information to README and a new TODO list Index: README =================================================================== RCS file: /cvsroot/octaviz/octaviz/README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- README 10 Nov 2006 03:45:44 -0000 1.4 +++ README 14 Mar 2008 14:12:17 -0000 1.5 @@ -83,6 +83,14 @@ - run make - make install + +UNINSTALL INSTRUCTIONS +After installing, there will be a list of installed files in +"install_manifest.txt". These files can be uninstalled with something +like: +$ cat install_manifest.txt | sudo xargs rm -fv + + Comments, suggestions, bug repports and patches are most welcome (you can use mailing lists at SourceForge or send to dr...@us...). Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- CMakeLists.txt 13 Jan 2008 13:20:07 -0000 1.18 +++ CMakeLists.txt 14 Mar 2008 14:12:17 -0000 1.19 @@ -4,13 +4,15 @@ PROJECT(OCTAVIZ) ## added from cmake FAQ, JJS 3/29/05; also needs the file cmake_uninstall.cmake.in -CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) - -ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +## currently not working (vtkGetDataRoot.m is showing up in the install_manifest.txt file twice) +## see the README for alternate uninstall method, JJS 3/14/08 +#CONFIGURE_FILE( +# "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" +# "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" +# IMMEDIATE @ONLY) +# +#ADD_CUSTOM_TARGET(uninstall +# "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") ## OPTION(USE_PREC_HEADERS "Use precompiled headers" OFF) --- NEW FILE: TODO --- vtkGetDataRoot.m is showing up in the install_manifest.txt file twice. This breaks the "make uninstall" command. |
From: Thomas W. <tho...@us...> - 2008-01-13 13:20:04
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20556 Modified Files: CMakeLists.txt Log Message: include CXXPICFLAG in COMPILERFLAGS, it got missed somehow Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- CMakeLists.txt 13 Jan 2008 13:18:08 -0000 1.17 +++ CMakeLists.txt 13 Jan 2008 13:20:07 -0000 1.18 @@ -126,8 +126,8 @@ -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering -lvtkGraphics -L${CMAKE_BINARY_DIR}/Common -loctaviz) - SET(COMPILERFLAGS ${CXXFLAGS} ${XTRA_CXXFLAGS} ${WNODEPRECATED} - -I${OCTINCLUDEDIR} -I${OCTINCLUDEDIR}/octave + SET(COMPILERFLAGS ${CXXFLAGS} ${CXXPICFLAG} ${XTRA_CXXFLAGS} ${WNODEPRECATED} + -I${OCTINCLUDEDIR} -I${OCTINCLUDEDIR}/octave ${INCLUDE_FLAGS}) SEPARATE_ARGUMENTS(COMPILERFLAGS) # Combine all flags, so that each compiler run gets them in the same |
From: Thomas W. <tho...@us...> - 2008-01-13 13:18:08
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19770 Modified Files: CMakeLists.txt Log Message: Use EXECUTE_PROCESS instead of EXEC_PROGRAM This makes it possible to strip empty arguments (XTRA_CXXFLAGS), which otherwise result in compilation problems http://lists.alioth.debian.org/pipermail/pkg-octave-devel/2008-January/002981.html Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- CMakeLists.txt 11 Jan 2008 15:10:22 -0000 1.16 +++ CMakeLists.txt 13 Jan 2008 13:18:08 -0000 1.17 @@ -52,24 +52,33 @@ MESSAGE(FATAL_ERROR "Octave is required, but octave-config was not found. Please install Octave and rerun cmake.") ENDIF(NOT OCTAVE_CONFIG) -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) +EXECUTE_PROCESS(COMMAND ${OCTAVE_CONFIG} --oct-site-dir + OUTPUT_VARIABLE OCT_SITE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) +EXECUTE_PROCESS(COMMAND ${OCTAVE_CONFIG} --m-site-dir + OUTPUT_VARIABLE M_SITE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) +EXECUTE_PROCESS(COMMAND ${OCTAVE_CONFIG} -p OCTINCLUDEDIR + OUTPUT_VARIABLE OCTINCLUDEDIR OUTPUT_STRIP_TRAILING_WHITESPACE) +EXECUTE_PROCESS(COMMAND ${OCTAVE_CONFIG} -p OCTLIBDIR + OUTPUT_VARIABLE OCTLIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE) 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) -EXEC_PROGRAM(${MKOCTFILE} ARGS "-p XTRA_CXXFLAGS" OUTPUT_VARIABLE XTRA_CXXFLAGS) +EXECUTE_PROCESS(COMMAND ${MKOCTFILE} -p ALL_CXXFLAGS + OUTPUT_VARIABLE ALL_CXXFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) +EXECUTE_PROCESS(COMMAND ${MKOCTFILE} -p XTRA_CXXFLAGS + OUTPUT_VARIABLE XTRA_CXXFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) # -mieee-fp -EXEC_PROGRAM(${MKOCTFILE} ARGS "-p CXXPICFLAG" OUTPUT_VARIABLE CXXPICFLAG) +EXECUTE_PROCESS(COMMAND ${MKOCTFILE} -p CXXPICFLAG + OUTPUT_VARIABLE CXXPICFLAG OUTPUT_STRIP_TRAILING_WHITESPACE) # -fPIC -EXEC_PROGRAM(${MKOCTFILE} ARGS "-p CXXFLAGS" OUTPUT_VARIABLE CXXFLAGS) +EXECUTE_PROCESS(COMMAND ${MKOCTFILE} -p CXXFLAGS + OUTPUT_VARIABLE CXXFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) # -O2 -EXEC_PROGRAM(${MKOCTFILE} ARGS "-p CXX" OUTPUT_VARIABLE OCTAVE_CXX) +EXECUTE_PROCESS(COMMAND ${MKOCTFILE} -p CXX + OUTPUT_VARIABLE OCTAVE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE) SET(CMAKE_CXX_COMPILER ${OCTAVE_CXX}) |
From: Thomas W. <tho...@us...> - 2008-01-13 12:24:02
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23278 Modified Files: vtkGetDataRoot.m Log Message: Bring @VTK_DATA_ROOT@ back Index: vtkGetDataRoot.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtkGetDataRoot.m,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- vtkGetDataRoot.m 11 Jan 2008 15:10:22 -0000 1.8 +++ vtkGetDataRoot.m 13 Jan 2008 12:24:04 -0000 1.9 @@ -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...> - 2008-01-11 15:10:20
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23335 Modified Files: CMakeLists.txt Log Message: edits for Mac OS X Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- CMakeLists.txt 22 Dec 2007 22:03:54 -0000 1.15 +++ CMakeLists.txt 11 Jan 2008 15:10:22 -0000 1.16 @@ -177,10 +177,10 @@ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${class}.o octaviz ${GCH_HEADER} # octaviz is the target from the shared lib in Common/ directory # COMMAND ${CMAKE_CXX_COMPILER} - COMMAND ${MKOCTFILE} + COMMAND ${MKOCTFILE} ARGS ${PCHFLAGS} ${LINK_FLAGS} -o ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct - -Wl,-rpath=${OCTAVIZ_RPATH} + #-Wl,-rpath=${OCTAVIZ_RPATH} ${CMAKE_CURRENT_BINARY_DIR}/${class}.o COMMENT "Linking ${class}.o to ${class}.oct" VERBATIM) |
From: Jonathan S. <jjs...@us...> - 2008-01-11 15:10:20
|
Update of /cvsroot/octaviz/octaviz/Common In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23335/Common Modified Files: CMakeLists.txt Log Message: edits for Mac OS X Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Common/CMakeLists.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- CMakeLists.txt 22 Dec 2007 22:03:54 -0000 1.12 +++ CMakeLists.txt 11 Jan 2008 15:10:22 -0000 1.13 @@ -1,12 +1,12 @@ +INCLUDE_DIRECTORIES(${OCTINCLUDEDIR} "${OCTINCLUDEDIR}/octave" ) +LINK_LIBRARIES(octinterp octave cruft vtkCommon) +LINK_DIRECTORIES(${OCTLIBDIR}) + ADD_LIBRARY( octaviz SHARED octaviz.cc ) 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}) - SET (common_octs) # track the .oct files for shorter DEPENDS lines @@ -29,7 +29,7 @@ COMMAND ${MKOCTFILE} ARGS --verbose ${WNODEPRECATED} ${INCLUDE_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR} ${LINK_FLAGS} ${APPLE_FLAG} - -Wl,-rpath=${OCTAVIZ_RPATH} + #-Wl,-rpath=${OCTAVIZ_RPATH} --output ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc DEPENDS octaviz |
From: Jonathan S. <jjs...@us...> - 2008-01-11 15:10:20
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23335/Scripts Modified Files: vtkGetDataRoot.m Log Message: edits for Mac OS X Index: vtkGetDataRoot.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtkGetDataRoot.m,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- vtkGetDataRoot.m 22 Dec 2007 21:39:04 -0000 1.7 +++ vtkGetDataRoot.m 11 Jan 2008 15:10:22 -0000 1.8 @@ -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"; |
From: Thomas W. <tho...@us...> - 2007-12-25 18:17:59
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2190/Scripts Modified Files: CMakeLists.txt Log Message: Use configured vtkGetDataRoot.m Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/CMakeLists.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- CMakeLists.txt 22 Dec 2007 22:03:55 -0000 1.5 +++ CMakeLists.txt 25 Dec 2007 18:18:01 -0000 1.6 @@ -2,5 +2,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtkGetDataRoot.m ${CMAKE_CURRENT_BINARY_DIR}/vtkGetDataRoot.m) +# Replace vtkGetDataRoot.m from the source directory by the configured file +# from the binary directory FILE(GLOB M_SCRIPTS "*.m") +LIST(REMOVE_ITEM M_SCRIPTS vtkGetDataRoot.m) +LIST(APPEND M_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/vtkGetDataRoot.m) INSTALL(FILES ${M_SCRIPTS} DESTINATION ${OCTAVIZ_M_DIR}) |
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:56
|
Update of /cvsroot/octaviz/octaviz/Rendering In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044/Rendering 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/Rendering/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 Graphics Imaging IO) -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) +OCTAVE_WRAP_VTK(Rendering) |
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:55
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044 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/CMakeLists.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- CMakeLists.txt 12 Oct 2007 10:09:32 -0000 1.14 +++ CMakeLists.txt 22 Dec 2007 22:03:54 -0000 1.15 @@ -14,10 +14,21 @@ ## OPTION(USE_PREC_HEADERS "Use precompiled headers" OFF) -STRING(COMPARE EQUAL ${USE_PREC_HEADERS} "OFF" PCH_ON) -IF(PCH_ON) - SET(CXX_COMPILER_PCH "g++" CACHE STRING "CMake overides compiler environment varibles. Put the compiler name here.") -ENDIF(PCH_ON) + +OPTION(WARN_ABOUT_DEPRECATED "Set -Wno-deprecated. If using precompiled headers, this must be set to the same value that was used when compiling VTK." ON ) +IF(WARN_ABOUT_DEPRECATED) + SET(WNODEPRECATED "-Wno-deprecated" CACHE STRING "Pass -Wno-deprecated to gcc.") +ENDIF(WARN_ABOUT_DEPRECATED) + + +# If the octaviz library is put outside Octave's library path, the +# .oct file need an rpath +# +# This is mainly for packagers who want to put the library into a path +# independent of the current Octave version, ie /usr/lib/octaviz +SET(OCTAVIZ_RPATH "" CACHE PATH "rpath for inclusion into the compiled .oct files") +MARK_AS_ADVANCED(OCTAVIZ_RPATH) + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/local/lib/vtk /usr/lib/vtk) @@ -52,6 +63,15 @@ 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) +EXEC_PROGRAM(${MKOCTFILE} ARGS "-p XTRA_CXXFLAGS" OUTPUT_VARIABLE XTRA_CXXFLAGS) +# -mieee-fp +EXEC_PROGRAM(${MKOCTFILE} ARGS "-p CXXPICFLAG" OUTPUT_VARIABLE CXXPICFLAG) +# -fPIC +EXEC_PROGRAM(${MKOCTFILE} ARGS "-p CXXFLAGS" OUTPUT_VARIABLE CXXFLAGS) +# -O2 +EXEC_PROGRAM(${MKOCTFILE} ARGS "-p CXX" OUTPUT_VARIABLE OCTAVE_CXX) +SET(CMAKE_CXX_COMPILER ${OCTAVE_CXX}) + # Make the values accessible from other CMakeLists.txt files # Also, this allows packagers to override the default values @@ -59,13 +79,12 @@ 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) # Macro to create Octave wrapper functions -MACRO(OCTAVE_WRAP_VTK kit deps) +MACRO(OCTAVE_WRAP_VTK kit) STRING(TOUPPER ${kit} ukit) INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake) @@ -74,72 +93,117 @@ # this is an ugly hack[TM] and should be fixed by e.g. # including a list of not-to-be-built-functions shipped with # Octaviz - 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 + # see http://public.kitware.com/pipermail/vtkusers/2004-November/077447.html + SET(CANNOT_BUILD vtkLongLongArray vtkSignedCharArray vtkUnsignedLongLongArray) 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) + # Mac OS X will not compile these as well. Will exclude until a better + # solution is determined + SET(CANNOT_BUILD ${CANNOT_BUILD} + vtkStreamTracer vtkTensorGlyph vtkDEMReader vtkTIFFWriter + vtkCameraInterpolator vtkQuaternionInterpolator vtkTransformInterpolator + vtkProjectedTerrainPath vtkImagePlaneWidget vtkDistributedStreamTracer + vtkPStreamTracer) ENDIF(APPLE) + FOREACH(class ${CANNOT_BUILD}) + SET(VTK_CLASS_WRAP_EXCLUDE_${class} 1 CACHE INTERNAL "We can't build ${class}" FORCE) + ENDFOREACH(class) - # SET(all_oct) - # FOREACH(class ${VTK_${ukit}_CLASSES}) - # IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) - # SET(all_oct ${all_oct} ${class}.oct) - # ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) - # ENDFOREACH(class) - # ADD_CUSTOM_TARGET(vtk${kit}.cc ALL cat ${all_ccs} > vtk${kit}.cc) - - SET(oct_flags -I${VTK_${ukit}_HEADER_DIR} -I../Common) - SET(oct_link_flags -L${X11_LIBRARY_DIR} -lX11 -lXt -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering -lvtkGraphics) - # ADD_CUSTOM_TARGET(vtk${kit}.oct ALL sleep 0\; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz vtk${kit}.cc) + # There are some header files in the Common/ directory that we need + # Add binary directory before source directory for the precompiled headers + SET(INCLUDE_FLAGS -I${VTK_${ukit}_HEADER_DIR} -I${CMAKE_BINARY_DIR}/Common -I${CMAKE_SOURCE_DIR}/Common) + SET(LINK_FLAGS -L${X11_LIBRARY_DIR} -lX11 -lXt + -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering -lvtkGraphics + -L${CMAKE_BINARY_DIR}/Common -loctaviz) + + SET(COMPILERFLAGS ${CXXFLAGS} ${XTRA_CXXFLAGS} ${WNODEPRECATED} + -I${OCTINCLUDEDIR} -I${OCTINCLUDEDIR}/octave + ${INCLUDE_FLAGS}) + SEPARATE_ARGUMENTS(COMPILERFLAGS) + # Combine all flags, so that each compiler run gets them in the same + # order; this seems necessary for precompiled headers + # SEPARATE_ARGUMENTS is necessary, otherwise cmake combines the flag into one + # long string and escapes it when passing to g++ later => bug # Precompiled headers IF(USE_PREC_HEADERS) # Which flags will mkoctfile use? - SET (PCHFLAGS "") - - STRING(REGEX MATCHALL "[^ ]+" MKOCT_FLAGS_LIST ${ALL_CXXFLAGS}) - FOREACH (flag ${MKOCT_FLAGS_LIST}) - SET (PCHFLAGS ${PCHFLAGS} ${flag}) - ENDFOREACH (flag ${MKOCT_FLAGS_LIST}) + SET (PCHFLAGS "-Winvalid-pch") - # MESSAGE(${PCHFLAGS}) + SET(GCH_HEADER ${OCTAVIZ_BINARY_DIR}/Common/OctavizCommon.h.gch) + # type path of file only once - ADD_CUSTOM_TARGET(OctavizCommon.h.gch ALL ${CXX_COMPILER_PCH} "-c" ${PCHFLAGS} ${oct_flags} ../Common/OctavizCommon.h) + ADD_CUSTOM_COMMAND(OUTPUT ${GCH_HEADER} + COMMAND ${CMAKE_CXX_COMPILER} + ARGS -c ${PCHFLAGS} ${COMPILERFLAGS} + "-o" ${GCH_HEADER} + ${OCTAVIZ_SOURCE_DIR}/Common/OctavizCommon.h + VERBATIM) ENDIF(USE_PREC_HEADERS) - # Remove prefix from oct install dir - STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OCT_INST_DIR ${OCT_SITE_DIR}) - + SET ( all_o "" ) SET ( all_oct "" ) + # track compiled object and .oct files for dependencies + FOREACH(class ${VTK_${ukit}_CLASSES}) - # LIST( GET VTK_${ukit}_CLASSES 10 class ) 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 ) - 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) + # create individual .cc files + + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc + DEPENDS vtkWrapOctave + COMMAND ${CMAKE_BINARY_DIR}/Wrapping/vtkWrapOctave + ARGS ${full_name} ${CMAKE_SOURCE_DIR}/Wrapping/hints 1 ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc + COMMENT "Generating ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc from ${full_name}" + VERBATIM) + + # compile individual .cc files into object files + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${class}.o + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc octaviz ${GCH_HEADER} + # octaviz is the target from the shared lib in Common/ directory + # COMMAND ${CMAKE_CXX_COMPILER} + COMMAND ${CMAKE_CXX_COMPILER} + ARGS -c ${PCHFLAGS} ${COMPILERFLAGS} + -o ${CMAKE_CURRENT_BINARY_DIR}/${class}.o + ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc + COMMENT "Compiling ${class}.cc to ${class}.o" + VERBATIM) + SET (all_o ${all_o} ${CMAKE_CURRENT_BINARY_DIR}/${class}.o ) + + # link object files into .oct files + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${class}.o octaviz ${GCH_HEADER} + # octaviz is the target from the shared lib in Common/ directory + # COMMAND ${CMAKE_CXX_COMPILER} + COMMAND ${MKOCTFILE} + ARGS ${PCHFLAGS} ${LINK_FLAGS} + -o ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct + -Wl,-rpath=${OCTAVIZ_RPATH} + ${CMAKE_CURRENT_BINARY_DIR}/${class}.o + COMMENT "Linking ${class}.o to ${class}.oct" + VERBATIM) + + SET (all_oct ${all_oct} ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct ) + ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) ENDFOREACH(class) + + # add custom target for the current kit + ADD_CUSTOM_TARGET( ${kit} ALL + COMMAND echo ${all_oct} + DEPENDS ${all_oct} vtkWrapOctave octaviz + COMMENT "Building VTK kit ${kit} in ${CMAKE_CURRENT_BINARY_DIR}." + VERBATIM) + + # INSTALL rule for the current .oct files + INSTALL(PROGRAMS ${all_oct} DESTINATION ${OCTAVIZ_OCT_DIR}) + + ADD_DEPENDENCIES(${kit} OctavizCommonFiles) ENDMACRO(OCTAVE_WRAP_VTK) -# MARK_AS_ADVANCED(CMAKE_INSTALL_PREFIX) + # Build octave wrappers for VTK kits. ADD_SUBDIRECTORY(Common) |
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:54
|
Update of /cvsroot/octaviz/octaviz/Imaging In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044/Imaging 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/Imaging/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 Filtering ) -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) +OCTAVE_WRAP_VTK(Imaging) |
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:54
|
Update of /cvsroot/octaviz/octaviz/IO In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044/IO 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/IO/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 Filtering ) -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) +OCTAVE_WRAP_VTK(IO) |
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:54
|
Update of /cvsroot/octaviz/octaviz/Widgets In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044/Widgets 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/Widgets/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(Widgets "${KIT_WRAP_DEPS}") -ADD_CUSTOM_TARGET( Widgets ALL COMMAND touch Widgets DEPENDS ${all_oct} ) -INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct}) -#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkWidgets.oct) +OCTAVE_WRAP_VTK(Widgets) |
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:54
|
Update of /cvsroot/octaviz/octaviz/Patented In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044/Patented 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/Patented/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CMakeLists.txt 8 Oct 2007 06:25:40 -0000 1.2 +++ CMakeLists.txt 22 Dec 2007 22:03:55 -0000 1.3 @@ -1,4 +1 @@ -SET(KIT_WRAP_DEPS Rendering) -OCTAVE_WRAP_VTK(Patented "${KIT_WRAP_DEPS}") -INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct}) -#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkPatented.oct) +OCTAVE_WRAP_VTK(Patented) |
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:54
|
Update of /cvsroot/octaviz/octaviz/Filtering In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044/Filtering 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/Filtering/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:39 -0000 1.3 +++ CMakeLists.txt 22 Dec 2007 22:03:54 -0000 1.4 @@ -1,5 +1 @@ -SET( KIT_WRAP_DEPS Common ) -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) +OCTAVE_WRAP_VTK(Filtering) |
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:54
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044/Scripts 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/Scripts/CMakeLists.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- CMakeLists.txt 11 Oct 2007 07:34:53 -0000 1.4 +++ CMakeLists.txt 22 Dec 2007 22:03:55 -0000 1.5 @@ -2,7 +2,5 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtkGetDataRoot.m ${CMAKE_CURRENT_BINARY_DIR}/vtkGetDataRoot.m) -EXEC_PROGRAM("ls" ${CURR_DIR} ARGS "*.m" OUTPUT_VARIABLE M_SCRIPTS_EXEC) -STRING(REGEX MATCHALL "[^\n]+" M_SCRIPTS ${M_SCRIPTS_EXEC}) - -INSTALL_PROGRAMS(${OCTAVIZ_M_DIR} ${M_SCRIPTS}) +FILE(GLOB M_SCRIPTS "*.m") +INSTALL(FILES ${M_SCRIPTS} DESTINATION ${OCTAVIZ_M_DIR}) |
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:53
|
Update of /cvsroot/octaviz/octaviz/Graphics In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044/Graphics 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/Graphics/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:39 -0000 1.3 +++ CMakeLists.txt 22 Dec 2007 22:03:54 -0000 1.4 @@ -1,5 +1 @@ -SET( KIT_WRAP_DEPS Filtering ) -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) +OCTAVE_WRAP_VTK(Graphics) |
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:53
|
Update of /cvsroot/octaviz/octaviz/Examples In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044/Examples 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/Examples/CMakeLists.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- CMakeLists.txt 11 Oct 2007 07:34:53 -0000 1.3 +++ CMakeLists.txt 22 Dec 2007 22:03:54 -0000 1.4 @@ -1,4 +1,2 @@ -EXEC_PROGRAM("ls" ${CURR_DIR} ARGS "*.m" OUTPUT_VARIABLE EXAMPLE_SCRIPTS_EXEC) -STRING(REGEX MATCHALL "[^\n]+" EXAMPLE_SCRIPTS ${EXAMPLE_SCRIPTS_EXEC}) - -INSTALL_PROGRAMS(${OCTAVIZ_EXAMPLES_DIR} ${EXAMPLE_SCRIPTS}) +FILE(GLOB EXAMPLE_SCRIPTS "*.m") +INSTALL(FILES ${EXAMPLE_SCRIPTS} DESTINATION ${OCTAVIZ_EXAMPLES_DIR}) |
From: Thomas W. <tho...@us...> - 2007-12-22 22:03:53
|
Update of /cvsroot/octaviz/octaviz/Hybrid In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2044/Hybrid 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/Hybrid/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( 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) +OCTAVE_WRAP_VTK(Hybrid) |