Commit 0887fc7f authored by Ben Boeckel's avatar Ben Boeckel

netcdf: sync with paraview

parent 8e7b453e
......@@ -32,7 +32,6 @@ macro (SetupCMBSuperBuild)
ENABLE_zlib
ENABLE_ftgl
ENABLE_netcdf
ENABLE_netcdfcpp
ENABLE_oce
ENABLE_paraviewsdk
)
......
......@@ -267,7 +267,6 @@ include(smtk)
#dependencies for moab
include(ftgl)
include(netcdf)
include(netcdfcpp)
include(oce)
include(cgm)
include(moab)
......
......@@ -11,7 +11,7 @@ endif()
# set(cgm_find_flags "-DCGM_CFG:PATH=${SuperBuild_BINARY_DIR}/cgm/src/cgm/cgm.make")
#endif()
add_external_project(moab
DEPENDS hdf5 netcdf netcdfcpp
DEPENDS hdf5 netcdf
# DEPENDS_OPTIONAL cgm
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=OFF
......
#this will only modify the cppflags for netcdf as the next project in the tree
#moab will unset the cppflags back to the original values
if (build-projects)
......@@ -13,32 +11,14 @@ endif()
add_external_project(netcdf
DEPENDS hdf5
PATCH_COMMAND
# this patch fixes following issues:
# 1. incorrect configure target
# 2. properly use the provided szip find package.
${CMAKE_COMMAND} -E copy_if_different ${SuperBuild_PROJECTS_DIR}/patches/netcdf.CMakeLists.txt
<SOURCE_DIR>/CMakeLists.txt
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_UTILITIES:BOOL=ON
-DENABLE_NETCDF:BOOL=ON
-DBUILD_TESTING:BOOL=OFF
-DBUILD_UTILITIES:BOOL=OFF
-DUSE_SZIP:BOOL=ON
-DUSE_HDF5:BOOL=ON
-DENABLE_NETCDF_4:BOOL=ON
-DENABLE_DAP:BOOL=OFF
)
add_external_project_step(patch_fix_ncgen3
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${SuperBuild_PROJECTS_DIR}/patches/netcdf.ncgen3.load.c
<SOURCE_DIR>/ncgen3/load.c
DEPENDEES update # do after update
DEPENDERS patch # do before patch
)
if(APPLE)
#special mac only script to fixup boost plugin install-names so that developers
#can use the superbuild properly from other projects
......@@ -50,3 +30,16 @@ add_external_project_step(install_name_fixup
-P ${CMAKE_CURRENT_LIST_DIR}/apple/fixup_library_rpath.cmake
DEPENDEES install)
endif()
#-------------------------------------------------------
# We've changed the API from upstream in VTK commits 6223f230 and
# 64cb89e3 to use size_t* instead of long* for (some) overloads of
# methods like NcVar::get. This patch adds a define to signal users
# that they should use size_t for these methods.
add_external_project_step(patch_netcdf_cxxheader
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${SuperBuild_PROJECTS_DIR}/patches/netcdf.cxx.netcdfcpp.h"
"<SOURCE_DIR>/cxx/netcdfcpp.h"
DEPENDEES update # do after update
DEPENDERS patch # do before patch
)
add_external_project(netcdfcpp
DEPENDS netcdf
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND <SOURCE_DIR>/configure
--prefix=<INSTALL_DIR>
--enable-shared
--disable-static
)
......@@ -77,7 +77,6 @@ add_external_project(paraview
# visitbridge
zlib
netcdf
netcdfcpp
${paraview_depends}
DEPENDS_OPTIONAL
freetype ffmpeg hdf5 libxml3 manta mpi silo cgns mesa osmesa
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -22,7 +22,7 @@ set(SMTK_DATA_DIR "" CACHE PATH "Location of SMTK's testing data")
add_external_project_or_just_build_dependencies(smtk
DEPENDS boost qt shiboken paraview remus hdf5
DEPENDS_OPTIONAL moab netcdf netcdfcpp
DEPENDS_OPTIONAL moab netcdf
CMAKE_ARGS
${extra_cmake_args}
"-C${CMAKE_BINARY_DIR}/env.cmake"
......
......@@ -215,14 +215,8 @@ add_revision(oce
)
add_revision(netcdf
URL "ftp://ftp.unidata.ucar.edu/pub/netcdf/old/netcdf-4.3.0.tar.gz"
URL_MD5 40c0e53433fc5dc59296ee257ff4a813
)
add_revision(netcdfcpp
URL "ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-cxx-4.2.tar.gz"
URL_MD5 d32b20c00f144ae6565d9e98d9f6204c
)
URL http://www.paraview.org/files/dependencies/netcdf-4.3.2.modified.tar.gz
URL_MD5 1841196c2bfcf10246966eecf92ad0ec)
add_revision(cgm
GIT_REPOSITORY "https://bitbucket.org/fathomteam/cgm.git"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment