Same edits to ParaView

Author: doutriaux1

CMake/cdat_modules/paraview_external.cmake

@@ -62,6 +62,9 @@ list(APPEND ParaView_tpl_args
   -DVTK_USE_SYSTEM_HDF5:BOOL=ON
   -DVTK_USE_SYSTEM_NETCDF:BOOL=ON
   -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON
+  -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON
+  -DVTK_USE_SYSTEM_JPEG:BOOL=ON
+  -DVTK_USE_SYSTEM_PNG:BOOL=ON
 )
 
 # Turn off testing and other non essential featues
@@ -74,21 +77,21 @@ list(APPEND ParaView_tpl_args
 )
 
 # Use cdat zlib
-if(NOT CDAT_USE_SYSTEM_ZLIB)
-  list(APPEND ParaView_tpl_args
-    -DZLIB_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
-    -DZLIB_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
-  )
-endif()
+#if(NOT CDAT_USE_SYSTEM_ZLIB)
+#  list(APPEND ParaView_tpl_args
+#    -DZLIB_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
+#    -DZLIB_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
+#  )
+#endif()
 
 # Use cdat libxml
-if(NOT CDAT_USE_SYSTEM_LIBXML2)
-  list(APPEND ParaView_tpl_args
-    -DLIBXML2_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include/libxml2
-    -DLIBXML2_LIBRARIES:FILEPATH=${cdat_EXTERNALS}/lib/libxml2${_LINK_LIBRARY_SUFFIX}
-    -DLIBXML2_XMLLINT_EXECUTABLE:FILEPATH=${cdat_EXTERNALS}/bin/xmllint
-  )
-endif()
+#if(NOT CDAT_USE_SYSTEM_LIBXML2)
+#  list(APPEND ParaView_tpl_args
+#    -DLIBXML2_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include/libxml2
+#    -DLIBXML2_LIBRARIES:FILEPATH=${cdat_EXTERNALS}/lib/libxml2${_LINK_LIBRARY_SUFFIX}
+#    -DLIBXML2_XMLLINT_EXECUTABLE:FILEPATH=${cdat_EXTERNALS}/bin/xmllint
+#  )
+#endif()
 
 # Use cdat hdf5
 if(NOT CDAT_USE_SYSTEM_HDF5)
@@ -101,12 +104,12 @@ if(NOT CDAT_USE_SYSTEM_HDF5)
     -DHDF5_hdf5_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libhdf5${_LINK_LIBRARY_SUFFIX}
   )
 
-  if(NOT CDAT_USE_SYSTEM_ZLIB)
-    list(APPEND ParaView_tpl_args
-      -DHDF5_z_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
-      -DHDF5_z_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
-    )
-  endif()
+#  if(NOT CDAT_USE_SYSTEM_ZLIB)
+#    list(APPEND ParaView_tpl_args
+#      -DHDF5_z_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
+#      -DHDF5_z_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
+#    )
+#  endif()
 endif()
 
 # Check if should build GUI