From 8ee10f19c2e07ad16ec4a25bb503825bb99e3e93 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 12 Aug 2013 13:02:13 +0000 Subject: [PATCH] Merge from V7_2_BR 09/08/2013 --- idl/vtkWrapIDL.c | 10 ++++++++++ src/PVGUI/create_class.py | 7 +++++++ src/Plugins/MedReader/CMakeLists.txt | 1 + src/Plugins/MedReader/IO/CMakeLists.txt | 2 +- .../MedReader/IO/Testing/Cxx/CMakeLists.txt | 16 ++++++++-------- src/Plugins/MedReader/IO/module.cmake | 7 ++++++- src/Plugins/TableReader/Reader/CMakeLists.txt | 2 +- .../TableReader/TableTo3DFilter/CMakeLists.txt | 2 +- 8 files changed, 35 insertions(+), 12 deletions(-) diff --git a/idl/vtkWrapIDL.c b/idl/vtkWrapIDL.c index 5960c236..60385a42 100644 --- a/idl/vtkWrapIDL.c +++ b/idl/vtkWrapIDL.c @@ -1370,6 +1370,16 @@ void outputFunction2(FILE *fp, ClassInfo *data) fprintf(fp,"#include \"PARAVIS_Gen_%s_i.hh\"\n",data->SuperClasses[i]); } + //RNV: to avoid link error on windows via Visual Studio + //undef GetObject macro. + if( strcmp(data->Name, "vtkWebGLExporter") == 0 ) { + fprintf(fp,"#ifdef WIN32\n"); + fprintf(fp," #ifdef GetObject\n"); + fprintf(fp," #undef GetObject\n"); + fprintf(fp," #endif\n"); + fprintf(fp,"#endif\n"); + } + fprintf(fp,"\nclass %s;\n",data->Name); fprintf(fp,"\nnamespace PARAVIS\n{\n\n"); #elif defined(IDL_I_CC) diff --git a/src/PVGUI/create_class.py b/src/PVGUI/create_class.py index 212a3e64..4532eda0 100755 --- a/src/PVGUI/create_class.py +++ b/src/PVGUI/create_class.py @@ -31,6 +31,13 @@ ffile_stream.write('#include ' + '\n') ffile_stream.write('#include "PARAVIS_Gen_i.hh"' + '\n') wfile_stream = open(wfile) for line in wfile_stream: + if line.split()[0] == "vtkWebGLExporter" : + ffile_stream.write('#ifdef WIN32\n') + ffile_stream.write(' #ifdef GetObject\n') + ffile_stream.write(' #undef GetObject\n') + ffile_stream.write(' #endif\n') + ffile_stream.write('#endif\n') + pass ffile_stream.write('#include "PARAVIS_Gen_%s_i.hh"'%(line.split()[0]) + '\n') pass wfile_stream.close() diff --git a/src/Plugins/MedReader/CMakeLists.txt b/src/Plugins/MedReader/CMakeLists.txt index da5fea06..8d71a8fd 100644 --- a/src/Plugins/MedReader/CMakeLists.txt +++ b/src/Plugins/MedReader/CMakeLists.txt @@ -63,6 +63,7 @@ OPTION(BUILD_SHARED_LIBS SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH} ) FIND_PACKAGE(MED REQUIRED) include_directories(${MED_INCLUDE_DIRS}) +include_directories(${MEDFILE_INCLUDE_DIRS}) # # process all vtk-modules defined in this plugin. This generates the necessary diff --git a/src/Plugins/MedReader/IO/CMakeLists.txt b/src/Plugins/MedReader/IO/CMakeLists.txt index 75c31530..d42e72a7 100644 --- a/src/Plugins/MedReader/IO/CMakeLists.txt +++ b/src/Plugins/MedReader/IO/CMakeLists.txt @@ -86,7 +86,7 @@ vtk_module_library(vtkMedReader ${MedReader_SRCS}) # CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/IO/config.h.cmake ${PROJECT_SOURCE_DIR}/IO/config.h ) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) -target_link_libraries(vtkMedReader ${MED_LIBRARIES}) +target_link_libraries(vtkMedReader ${MEDFILE_LIBRARIES}) #set(MedReader_BUILD_Testing ${VTK_BUILD_TESTING} CACHE BOOL "Build tests for the MedReader filter") diff --git a/src/Plugins/MedReader/IO/Testing/Cxx/CMakeLists.txt b/src/Plugins/MedReader/IO/Testing/Cxx/CMakeLists.txt index 99efa27b..3240b822 100644 --- a/src/Plugins/MedReader/IO/Testing/Cxx/CMakeLists.txt +++ b/src/Plugins/MedReader/IO/Testing/Cxx/CMakeLists.txt @@ -62,16 +62,16 @@ add_executable(TestMedWriteOcta12 ${TestMedWriteOcta12_SRCS}) if(${HDF5_IS_PARALLEL}) add_executable(TestMedParallelRead ${TestMedParallelRead_SRCS}) add_executable(TestMedParallelWrite ${TestMedParallelWrite_SRCS}) - target_link_libraries(TestMedParallelRead vtkParallelCore ${MED_LIBRARIES}) - target_link_libraries(TestMedParallelWrite vtkParallelCore ${MED_LIBRARIES}) + target_link_libraries(TestMedParallelRead vtkParallelCore ${MEDFILE_LIBRARIES}) + target_link_libraries(TestMedParallelWrite vtkParallelCore ${MEDFILE_LIBRARIES}) endif(${HDF5_IS_PARALLEL}) INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../../module.cmake) -target_link_libraries(TestMedReader ${${vtk-module-test}_DEPENDS} ${MED_LIBRARIES}) -target_link_libraries(TestMedPolyhedron ${MED_LIBRARIES}) -target_link_libraries(TestMedReadPolyhedron ${MED_LIBRARIES}) -target_link_libraries(TestMedDescendingPolyhedron ${MED_LIBRARIES}) -target_link_libraries(TestMedReadDescendingPolyhedron ${MED_LIBRARIES}) -target_link_libraries(TestMedWriteOcta12 ${MED_LIBRARIES}) +target_link_libraries(TestMedReader ${${vtk-module-test}_DEPENDS} ${MEDFILE_LIBRARIES}) +target_link_libraries(TestMedPolyhedron ${MEDFILE_LIBRARIES}) +target_link_libraries(TestMedReadPolyhedron ${MEDFILE_LIBRARIES}) +target_link_libraries(TestMedDescendingPolyhedron ${MEDFILE_LIBRARIES}) +target_link_libraries(TestMedReadDescendingPolyhedron ${MEDFILE_LIBRARIES}) +target_link_libraries(TestMedWriteOcta12 ${MEDFILE_LIBRARIES}) diff --git a/src/Plugins/MedReader/IO/module.cmake b/src/Plugins/MedReader/IO/module.cmake index 5a1f56bc..80282b0a 100644 --- a/src/Plugins/MedReader/IO/module.cmake +++ b/src/Plugins/MedReader/IO/module.cmake @@ -3,7 +3,12 @@ SET(VTK_LIBS vtkCommonExecutionModel vtkParallelCore) vtk_module(vtkMedReader DEPENDS ${VTK_LIBS} - TEST_DEPENDS + vtkRenderingFreeTypeOpenGL + vtkRenderingOpenGL + vtkRenderingFreeType + vtkRenderingCore + vtkInteractionStyle + TEST_DEPENDS vtkRenderingCore vtkTestingRendering vtkInteractionStyle diff --git a/src/Plugins/TableReader/Reader/CMakeLists.txt b/src/Plugins/TableReader/Reader/CMakeLists.txt index 9de037d5..b03e0a66 100644 --- a/src/Plugins/TableReader/Reader/CMakeLists.txt +++ b/src/Plugins/TableReader/Reader/CMakeLists.txt @@ -24,7 +24,7 @@ SET(READER_SRCS ADD_LIBRARY(vtkVisuTableReader ${READER_SRCS}) -TARGET_LINK_LIBRARIES(vtkVisuTableReader ${VTK_LIBS} ${vtkInfovis} ${QT_LIBS}) +TARGET_LINK_LIBRARIES(vtkVisuTableReader ${VTK_LIBRARIES} ${vtkInfovis} ${QT_LIBS}) INSTALL( TARGETS vtkVisuTableReader diff --git a/src/Plugins/TableReader/TableTo3DFilter/CMakeLists.txt b/src/Plugins/TableReader/TableTo3DFilter/CMakeLists.txt index c5fd1db3..06316918 100644 --- a/src/Plugins/TableReader/TableTo3DFilter/CMakeLists.txt +++ b/src/Plugins/TableReader/TableTo3DFilter/CMakeLists.txt @@ -23,7 +23,7 @@ SET(TABLETO3D_SRCS ADD_LIBRARY(vtkTableTo3D ${TABLETO3D_SRCS}) -TARGET_LINK_LIBRARIES(vtkTableTo3D ${VTK_LIBS}) +TARGET_LINK_LIBRARIES(vtkTableTo3D ${VTK_LIBRARIES}) INSTALL( TARGETS vtkTableTo3D -- 2.39.2