Windows compatibility

diff --git a/src/Plugins/MEDReader/IO/CMakeLists.txt b/src/Plugins/MEDReader/IO/CMakeLists.txt
index ec86a8289d595ba82b6dba277f35daa165b2efe0..53dfb553ff470a4b8439866969bda75d93601106 100644 (file)
--- a/src/Plugins/MEDReader/IO/CMakeLists.txt
+++ b/src/Plugins/MEDReader/IO/CMakeLists.txt
@@ -48,7 +48,7 @@ ELSE(HDF5_IS_PARALLEL)
 ENDIF(HDF5_IS_PARALLEL)
 
 VTK_MODULE_LIBRARY(vtkMEDReader ${MEDReader_SRCS})
-TARGET_LINK_LIBRARIES(vtkMEDReader ${PARAVIEW_LIBRARIES} MEDLoaderForPV ${MEDFILE_C_LIBRARIES})
+TARGET_LINK_LIBRARIES(vtkMEDReader vtkPVVTKExtensionsRendering vtkFiltersGeneral vtkFiltersCore vtkRenderingOpenGL ${PARAVIEW_LIBRARIES} MEDLoaderForPV ${MEDFILE_C_LIBRARIES})
 
 INSTALL(
   TARGETS vtkMEDReader MEDLoaderForPV

diff --git a/src/Plugins/MEDReader/ParaViewPlugin/pqMEDReaderTimesFlagsWidget.cxx b/src/Plugins/MEDReader/ParaViewPlugin/pqMEDReaderTimesFlagsWidget.cxx
index 25113c762c94933198f6a59e8dfbb2ba71c6f86c..4590a020f5bb582ffc15a6d924646507612e60fe 100644 (file)
--- a/src/Plugins/MEDReader/ParaViewPlugin/pqMEDReaderTimesFlagsWidget.cxx
+++ b/src/Plugins/MEDReader/ParaViewPlugin/pqMEDReaderTimesFlagsWidget.cxx
@@ -188,10 +188,11 @@ void pqMEDReaderTimesFlagsWidget::UpdateTimeSteps()
         const char* leafString = prop->GetElement(i - 1);
         const char* tmp = strchr(leafString, '/');
         size_t num = tmp - leafString;
-        char dest[num];
+        char* dest = new char[num];
         strncpy(dest, leafString, num);
         dest[num] = '\0';
         tsId = strtol(dest + 2, NULL, 10);
+        delete dest;
         break;
         }
       }

diff --git a/src/Plugins/MEDReader/Test/CMakeLists.txt b/src/Plugins/MEDReader/Test/CMakeLists.txt
index 9b1e06d97ecb202ecf5256f01485b6c4b8075f76..77e434f5581089423c9c0c02fda9862b8b453a92 100644 (file)
--- a/src/Plugins/MEDReader/Test/CMakeLists.txt
+++ b/src/Plugins/MEDReader/Test/CMakeLists.txt
@@ -99,7 +99,7 @@ SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
 
 FOREACH(tfile ${TEST_NUMBERS})
   ADD_TEST(testMEDReader${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader${tfile}.py -B ${CMAKE_CURRENT_SOURCE_DIR}/Baselines )
-  SET_TESTS_PROPERTIES(testMEDReader${tfile} PROPERTIES ENVIRONMENT ${tests_env})
+  SET_TESTS_PROPERTIES(testMEDReader${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
 ENDFOREACH()
 
 ENDIF(KW_TESTING_PLATFORM)

diff --git a/test/standalone/gui/CMakeLists.txt b/test/standalone/gui/CMakeLists.txt
index eea2c6e591a30fd9ab6e9d3624cd8c9cb4f89047..295798519288524871b7697b56426c9b4b8c067f 100644 (file)
--- a/test/standalone/gui/CMakeLists.txt
+++ b/test/standalone/gui/CMakeLists.txt
@@ -71,6 +71,6 @@ ADD_EXECUTABLE(paraLight
     ${pl_FORMS_HEADERS}
     ${rcs_sources})
     
-TARGET_LINK_LIBRARIES(paraLight ${QT_LIBRARIES} pqApplicationComponents )#vtkRenderingFreeTypeOpenGL)
+TARGET_LINK_LIBRARIES(paraLight ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeType)#vtkRenderingFreeTypeOpenGL)
 #INSTALL(TARGET paraLight bin)
 

diff --git a/test/standalone/simple/CMakeLists.txt b/test/standalone/simple/CMakeLists.txt
index 3ae3cecb3b6d503ca0f276e420960991c4bf3dd5..9e4dbd152990e6d5e78d2aa1ee5608968576316c 100644 (file)
--- a/test/standalone/simple/CMakeLists.txt
+++ b/test/standalone/simple/CMakeLists.txt
@@ -32,5 +32,5 @@ INCLUDE_DIRECTORIES(
   )
 
 ADD_EXECUTABLE(paraCmdLine ${pl_SOURCES})
-TARGET_LINK_LIBRARIES(paraCmdLine ${PYTHON_LIBRARIES} ${QT_LIBRARIES} pqApplicationComponents)
+TARGET_LINK_LIBRARIES(paraCmdLine ${PYTHON_LIBRARIES} ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeType)