[MOAB-dev] commit/MOAB: 6 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Wed Feb 26 15:13:56 CST 2014
6 new commits in MOAB:
https://bitbucket.org/fathomteam/moab/commits/544cc920f598/
Changeset: 544cc920f598
Branch: None
User: vijaysm
Date: 2014-01-13 22:21:31
Summary: Fix HDF5 dependency on libdl (DLOpen) and use nc-config if available to get the necessary information for Netcdf.
Affected #: 2 files
diff --git a/config/hdf5.m4 b/config/hdf5.m4
index 4d3d11d..b603d24 100644
--- a/config/hdf5.m4
+++ b/config/hdf5.m4
@@ -28,16 +28,17 @@ if test "xyes" != "x$HAVE_LIB_HDF5"; then
HAVE_LIB_HDF5=no
FATHOM_HDF5_LIBS_HELPER
+ FATHOM_HDF5_LIBS_HELPER([-ldl])
if test $HAVE_ZLIB = yes; then
- FATHOM_HDF5_LIBS_HELPER([-lz])
- FATHOM_HDF5_LIBS_HELPER([-lz -lpthread])
+ FATHOM_HDF5_LIBS_HELPER([-lz -ldl])
+ FATHOM_HDF5_LIBS_HELPER([-lz -ldl -lpthread])
fi
if test $HAVE_SZIP = yes; then
- FATHOM_HDF5_LIBS_HELPER([-lsz])
- FATHOM_HDF5_LIBS_HELPER([-lsz -lpthread])
+ FATHOM_HDF5_LIBS_HELPER([-lsz -ldl])
+ FATHOM_HDF5_LIBS_HELPER([-lsz -ldl -lpthread])
if test $HAVE_ZLIB = yes; then
- FATHOM_HDF5_LIBS_HELPER([-lsz -lz])
- FATHOM_HDF5_LIBS_HELPER([-lsz -lz -lpthread])
+ FATHOM_HDF5_LIBS_HELPER([-lsz -lz -ldl])
+ FATHOM_HDF5_LIBS_HELPER([-lsz -lz -ldl -lpthread])
fi
fi
fi
diff --git a/config/netcdf.m4 b/config/netcdf.m4
index 041327d..b3fb2d6 100644
--- a/config/netcdf.m4
+++ b/config/netcdf.m4
@@ -85,35 +85,50 @@ if test "xno" != "x$NETCDF_ARG"; then
NETCDF_CPPFLAGS="-I${NETCDF_ARG}"
fi
fi
-
+
+ AC_PATH_PROG([NC_CONFIG], [nc-config], [no], [${NETCDF_ARG}/bin])
+ if test "$NC_CONFIG" != "no" ; then
+ NETCDF_CPPFLAGS="`$NC_CONFIG --cflags`"
+ NETCDF_LDFLAGS="`$NC_CONFIG --libs`"
+ NETCDF_VERSION="`$NC_CONFIG --version`"
+ AC_SUBST([NETCDF_CPPFLAGS])
+ AC_SUBST([NETCDF_LDFLAGS])
+ AC_SUBST([NETCDF_VERSION])
+ m4_if([$1], [], [:], [$1])
+ else
+ HAVE_NETCDF=no
+ AC_MSG_WARN("NetCDF configuration utility not found")
+ fi
+
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$NETCDF_CPPFLAGS $CPPFLAGS"
old_LDFLAGS="$LDFLAGS"
- LDFLAGS="$NETCDF_LDFLAGS $HDF5_LDFLAGS $LDFLAGS"
+ LDFLAGS="$NETCDF_LDFLAGS $LDFLAGS"
# Check for C library
AC_LANG_PUSH([C])
AC_CHECK_HEADERS( [netcdf.h],
[FATHOM_CHECK_NETCDF_LIMITS([$1],[$2],[netcdf.h],[NETCDF_SUFFICIENT_DIM_VARS])],
[AC_MSG_WARN([[NetCDF header not found.]]); HAVE_NETCDF=no] )
-
+
# Check if netcdf is usable by itself
- AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf"], [
- # Check if netcdf is usable with HDF5
- unset ac_cv_lib_netcdf
- unset ac_cv_lib_netcdf_nc_create
- # If we haven't already looked for HDF5 libraries, again now incase
- # they're in the NetCDF lib directory.
- FATHOM_DETECT_HDF5_LIBS
- LDFLAGS="$LDFLAGS $HDF5_LDFLAGS"
- AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf -lhdf5_hl"], [
- # Try one more time with HDF5 and libcurl
- unset ac_cv_lib_netcdf
- unset ac_cv_lib_netcdf_nc_create
- AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf -lhdf5_hl -lcurl"],
- [HAVE_NETCDF=no], [-lhdf5_hl $HDF5_LIBS -lcurl] )],
- [-lhdf5_hl $HDF5_LIBS] )],
- )
+ AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf"], [NETCDF_LIBS=${NETCDF_LDFLAGS}] )
+# AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf"], [
+# # Check if netcdf is usable with HDF5
+# unset ac_cv_lib_netcdf
+# unset ac_cv_lib_netcdf_nc_create
+# # If we haven't already looked for HDF5 libraries, again now incase
+# # they're in the NetCDF lib directory.
+# FATHOM_DETECT_HDF5_LIBS
+# LDFLAGS="$LDFLAGS $HDF5_LDFLAGS"
+# AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf -lhdf5_hl"], [
+# # Try one more time with HDF5 and libcurl
+# unset ac_cv_lib_netcdf
+# unset ac_cv_lib_netcdf_nc_create
+# AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf -lhdf5_hl "],
+# [HAVE_NETCDF=no], [-lhdf5_hl $HDF5_LIBS ] )],
+# [-lhdf5_hl $HDF5_LIBS] )],
+# )
CPPFLAGS="$old_CPPFLAGS"
LDFLAGS="$old_LDFLAGS"
https://bitbucket.org/fathomteam/moab/commits/174c7ef27f82/
Changeset: 174c7ef27f82
Branch: None
User: vijaysm
Date: 2014-01-14 00:47:51
Summary: Remove an unwanted command.
Affected #: 1 file
diff --git a/config/netcdf.m4 b/config/netcdf.m4
index b3fb2d6..fbdfd7c 100644
--- a/config/netcdf.m4
+++ b/config/netcdf.m4
@@ -94,7 +94,6 @@ if test "xno" != "x$NETCDF_ARG"; then
AC_SUBST([NETCDF_CPPFLAGS])
AC_SUBST([NETCDF_LDFLAGS])
AC_SUBST([NETCDF_VERSION])
- m4_if([$1], [], [:], [$1])
else
HAVE_NETCDF=no
AC_MSG_WARN("NetCDF configuration utility not found")
https://bitbucket.org/fathomteam/moab/commits/e159eeaa10e0/
Changeset: e159eeaa10e0
Branch: None
User: vijaysm
Date: 2014-01-14 00:48:14
Summary: Fix the configuration for VTK. Tested on Ubuntu with VTK-6.0. Several
existing checks for libraries were invalid. We should do separate
checks based on the version to satisfy a broad range of dependencies.
Affected #: 1 file
diff --git a/configure.ac b/configure.ac
index ea22a5e..d1e6f73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -593,13 +593,14 @@ AC_ARG_WITH( [vtk-lib-suffix],
[case "x$withval" in
xyes)
AC_MSG_ERROR([Must specify a non-empty suffix!])
- VTK_LIB_SUFFIX=
+ VTK_LIB_SUFFIX=
;;
xno)
- VTK_LIB_SUFFIX=
+ AC_MSG_ERROR([Must specify a non-empty suffix!])
+ VTK_LIB_SUFFIX=
;;
x*)
- VTK_LIB_SUFFIX="$withval"
+ VTK_LIB_SUFFIX="$withval"
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-vtk-lib-suffix=\"${withval}\""
;;
esac],[VTK_LIB_SUFFIX=] )
@@ -758,6 +759,55 @@ AC_SUBST(ZOLTAN_INC_FLAGS)
EXPORT_LDFLAGS="$ZOLTAN_LIB_FLAGS $EXPORT_LDFLAGS"
+
+dnl Define a function that checks for the existence of a library
+dnl and if it exists, prepends the corresponding link flag to a
+dnl sepecified variable
+dnl Arguments:
+dnl - The library name
+dnl - The name of the variable to which to prepend the library link flag
+dnl - List of extra libraries required for link test
+dnl - Optional library path linker argument (e.g. -L/opt/foo)
+ AC_DEFUN([FATHOM_CHECK_LIB_LIST],[
+ old_LIBS="$LIBS"
+ LIBS="$5 ${$3} $old_LIBS"
+ AC_HAVE_LIBRARY([$1],[$3="-l$1 ${$3}"],[],[$4])
+ #AC_HAVE_LIBRARY($1,[$3="-l$1 ${$3}"],[],[$4])
+ #AC_CHECK_LIB([$1${2}], main,
+ # [$3="-l$1 ${$3}"
+ # ac_cv_lib_$1${2}=yes],
+ # [ac_cv_lib_$1${2}=no],[$4])dnl
+ #ac_cv_lib_$1=ac_cv_lib_[]$1[]_main
+ #ac_cv_lib_[]AC_Lib_Name()=ac_cv_lib_[]AC_Lib_Name()_main
+ LIBS="$old_LIBS"
+ ])
+
+dnl Define a function that checks for the existence of a library
+dnl and if it exists, prepends the corresponding link flag to a
+dnl sepecified variable
+dnl Arguments:
+dnl - The library name
+dnl - The name of the variable to which to prepend the library link flag
+dnl - List of extra libraries required for link test
+dnl - Optional library path linker argument (e.g. -L/opt/foo)
+ AC_DEFUN([FATHOM_CHECK_VTK_LIB_LIST],[
+ old_LIBS="$LIBS"
+ LIBS="$5 ${$3} $old_LIBS"
+ #AC_HAVE_LIBRARY([$1${2}],[$3="-l$1$2 ${$3}"],[],[$4])
+ #AC_HAVE_LIBRARY($1,[$3="-l$1 ${$3}"],[],[$4])
+ AC_CHECK_LIB([$1$VTK_LIB_SUFFIX], main,
+ [$3="-l$1$VTK_LIB_SUFFIX ${$3}"],
+ [],[$4])dnl
+ #AC_CHECK_LIB([$1$VTK_LIB_SUFFIX], main,
+ # [$3="-l$1$VTK_LIB_SUFFIX ${$3}"
+ # eval "ac_cv_lib_$1$VTK_LIB_SUFFIX=yes"],
+ # [eval "ac_cv_lib_$1$VTK_LIB_SUFFIX=no"],[$4])dnl
+ #ac_cv_lib_$1=ac_cv_lib_[]$1[]_main
+ #ac_cv_lib_[]AC_Lib_Name()=ac_cv_lib_[]AC_Lib_Name()_main
+ LIBS="$old_LIBS"
+ ])
+
+
################################################################################
# VTK for qvdual and/or vtkMOABReader
################################################################################
@@ -786,7 +836,7 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
AC_LANG_CPLUSPLUS
VTK_INCLUDES=
- VTK_LIB_SUFFIX=-pv3.98
+ #VTK_LIB_SUFFIX=-pv3.98
case "x$WITH_VTK" in
xyes|x)
VTK_LIB_DIR=
@@ -806,9 +856,10 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
for dir in /usr/lib/vtk /usr/lib /usr/bin /usr; do
if test "x" = "x$VTK_LIB_DIR"; then
LIBS="$old_LIBS -L$dir"
- unset ac_cv_lib_vtkCommon
- unset ac_cv_lib_vtkCommon_main
- AC_HAVE_LIBRARY([vtkCommonCore$VTK_LIB_SUFFIX],[VTK_LIB_DIR=$dir])
+ #unset ac_cv_lib_vtkCommon
+ #unset ac_cv_lib_vtkCommon_main
+ #AC_HAVE_LIBRARY([vtkCommonCore$VTK_LIB_SUFFIX],[VTK_LIB_DIR=$dir])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkCommonCore],[$VTK_LIB_SUFFIX], [VTK_LIB_DIR],[],[-L$dir])
fi
done
if test "x" = "x$VTK_LIB_DIR"; then
@@ -828,15 +879,15 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
# Check for non-installed VTK source
AC_CHECK_FILE([vtkUnstructuredGrid.h],[
for subdir in . Common Common/DataModel Filtering GenericFiltering Graphics Hybrid Imaging Parallel Patented Rendering Utilities Utilities/vtkexpat Utilities/expat Utilities/DICOMParser Utilties/vtkpng Utilities/vtkzlib Utilities/freetype/include/freetype Wrapping; do
- AC_MSG_CHECKING([for directory ${WITH_VTK}/$subdir])
- if test -d ${WITH_VTK}/$subdir; then
- VTK_INC_DIR="$VTK_INC_DIR -I${WITH_VTK}/$subdir"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi
- done
- ],[AC_MSG_ERROR([VTK includes not found])]
+ AC_MSG_CHECKING([for directory ${WITH_VTK}/$subdir])
+ if test -d ${WITH_VTK}/$subdir; then
+ VTK_INC_DIR="$VTK_INC_DIR -I${WITH_VTK}/$subdir"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ done
+ ],[AC_MSG_ERROR([VTK includes not found])]
)
fi
VTK_INCLUDES="$VTK_INC_DIR"
@@ -844,7 +895,8 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
for dir in ${WITH_VTK}/lib ${WITH_VTK}/lib/vtk ${VTK_DIR}/bin ${WITH_VTK}/bin ${WITH_VTK}; do
if test "x" = "x$VTK_LIB_DIR"; then
LIBS="$old_LIBS -L$dir"
- AC_HAVE_LIBRARY([vtkCommonCore$VTK_LIB_SUFFIX],[VTK_LIB_DIR=$dir])
+ #AC_HAVE_LIBRARY([vtkCommonCore${VTK_LIB_SUFFIX}],[VTK_LIB_DIR=$dir])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkCommonCore],[$VTK_LIB_SUFFIX], [VTK_LIB_DIR],[],[-L$dir])
fi
done
if test "x" = "x$VTK_LIB_DIR"; then
@@ -853,22 +905,7 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
LIBS="$old_LIBS"
;;
esac
-
-dnl Define a function that checks for the existence of a library
-dnl and if it exists, prepends the corresponding link flag to a
-dnl sepecified variable
-dnl Arguments:
-dnl - The library name
-dnl - The name of the variable to which to prepend the library link flag
-dnl - List of extra libraries required for link test
-dnl - Optional library path linker argument (e.g. -L/opt/foo)
- AC_DEFUN([FATHOM_CHECK_LIB_LIST],[
- old_LIBS="$LIBS"
- LIBS="$5 ${$3} $old_LIBS"
- AC_HAVE_LIBRARY([$1$2],[$3="-l$1$2 ${$3}"],[],[$4])
- LIBS="$old_LIBS"
- ])
-
+
# These are ordered such that a given library depends only on those libraries
# that preceed it in the list.
FATHOM_CHECK_LIB_LIST([pthread],[],[vtk_sys_libs])
@@ -883,27 +920,29 @@ dnl - Optional library path linker argument (e.g. -L/opt/foo)
FATHOM_CHECK_LIB_LIST([GL],[], [vtk_x_libs],[$x_libs_arg],[-L$x_libraries])
FATHOM_CHECK_LIB_LIST([GLU],[], [vtk_x_libs],[$x_libs_arg],[-L$x_libraries])
vtk_libs_arg="-L$x_libraries $vtk_x_libs $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $vtk_sys_libs"
- FATHOM_CHECK_LIB_LIST([vtksys],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkCommonCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkDICOMParser],[$VTK_LIB_SUFFIX],[vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkfreetype],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkexpat],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkzlib],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkpng],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkjpeg],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtktiff],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkftgl],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkFiltering],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkImaging],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([verdict],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkGraphics],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkNetCDF],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkexoIIc],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkmetaio],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkIO],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkRendering],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkParallel],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkHybrid],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+
+ #FATHOM_CHECK_LIB_LIST(vtksys$VTK_LIB_SUFFIX,[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtksys],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkCommonCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkDICOMParser],[$VTK_LIB_SUFFIX],[vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkfreetype],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkexpat],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkzlib],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkpng],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkjpeg],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtktiff],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkftgl],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkFiltersCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkImagingCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([verdict],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkGraphics],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkNetCDF],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkexoIIc],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkmetaio],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkIOCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkRenderingCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkParallelCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ #FATHOM_CHECK_VTK_LIB_LIST([vtkHybrid],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
# Make sure we found at least vtkCommonCore and vtkRendering
if ! echo "x $vtk_libs" | grep lvtkCommonCore >/dev/null; then
https://bitbucket.org/fathomteam/moab/commits/92e900be0897/
Changeset: 92e900be0897
Branch: None
User: vijaysm
Date: 2014-01-29 17:09:21
Summary: Remove the miscellaneous comments. Enable the netcdf library checks similar to original master version.
Affected #: 1 file
diff --git a/config/netcdf.m4 b/config/netcdf.m4
index fbdfd7c..4c13802 100644
--- a/config/netcdf.m4
+++ b/config/netcdf.m4
@@ -111,23 +111,23 @@ if test "xno" != "x$NETCDF_ARG"; then
[AC_MSG_WARN([[NetCDF header not found.]]); HAVE_NETCDF=no] )
# Check if netcdf is usable by itself
- AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf"], [NETCDF_LIBS=${NETCDF_LDFLAGS}] )
-# AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf"], [
-# # Check if netcdf is usable with HDF5
-# unset ac_cv_lib_netcdf
-# unset ac_cv_lib_netcdf_nc_create
-# # If we haven't already looked for HDF5 libraries, again now incase
-# # they're in the NetCDF lib directory.
-# FATHOM_DETECT_HDF5_LIBS
-# LDFLAGS="$LDFLAGS $HDF5_LDFLAGS"
-# AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf -lhdf5_hl"], [
-# # Try one more time with HDF5 and libcurl
-# unset ac_cv_lib_netcdf
-# unset ac_cv_lib_netcdf_nc_create
-# AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf -lhdf5_hl "],
-# [HAVE_NETCDF=no], [-lhdf5_hl $HDF5_LIBS ] )],
-# [-lhdf5_hl $HDF5_LIBS] )],
-# )
+ # AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf"], [NETCDF_LIBS=${NETCDF_LDFLAGS}] )
+ AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf"], [
+ # Check if netcdf is usable with HDF5
+ unset ac_cv_lib_netcdf
+ unset ac_cv_lib_netcdf_nc_create
+ # If we haven't already looked for HDF5 libraries, again now incase
+ # they're in the NetCDF lib directory.
+ FATHOM_DETECT_HDF5_LIBS
+ LDFLAGS="$LDFLAGS $HDF5_LDFLAGS"
+ AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf -lhdf5_hl $HDF5_LIBS"], [
+ # Try one more time with HDF5 and libcurl
+ unset ac_cv_lib_netcdf
+ unset ac_cv_lib_netcdf_nc_create
+ AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf -lhdf5_hl -lcurl "],
+ [HAVE_NETCDF=no], [-lhdf5_hl $HDF5_LIBS -lcurl ] )],
+ [-lhdf5_hl $HDF5_LIBS] )],
+ )
CPPFLAGS="$old_CPPFLAGS"
LDFLAGS="$old_LDFLAGS"
https://bitbucket.org/fathomteam/moab/commits/7852969d01cc/
Changeset: 7852969d01cc
Branch: None
User: vijaysm
Date: 2014-01-29 17:19:59
Summary: Remove stale comments in VTK configuration.
Affected #: 1 file
diff --git a/configure.ac b/configure.ac
index d1e6f73..82bf72b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -772,13 +772,6 @@ dnl - Optional library path linker argument (e.g. -L/opt/foo)
old_LIBS="$LIBS"
LIBS="$5 ${$3} $old_LIBS"
AC_HAVE_LIBRARY([$1],[$3="-l$1 ${$3}"],[],[$4])
- #AC_HAVE_LIBRARY($1,[$3="-l$1 ${$3}"],[],[$4])
- #AC_CHECK_LIB([$1${2}], main,
- # [$3="-l$1 ${$3}"
- # ac_cv_lib_$1${2}=yes],
- # [ac_cv_lib_$1${2}=no],[$4])dnl
- #ac_cv_lib_$1=ac_cv_lib_[]$1[]_main
- #ac_cv_lib_[]AC_Lib_Name()=ac_cv_lib_[]AC_Lib_Name()_main
LIBS="$old_LIBS"
])
@@ -793,17 +786,9 @@ dnl - Optional library path linker argument (e.g. -L/opt/foo)
AC_DEFUN([FATHOM_CHECK_VTK_LIB_LIST],[
old_LIBS="$LIBS"
LIBS="$5 ${$3} $old_LIBS"
- #AC_HAVE_LIBRARY([$1${2}],[$3="-l$1$2 ${$3}"],[],[$4])
- #AC_HAVE_LIBRARY($1,[$3="-l$1 ${$3}"],[],[$4])
AC_CHECK_LIB([$1$VTK_LIB_SUFFIX], main,
[$3="-l$1$VTK_LIB_SUFFIX ${$3}"],
[],[$4])dnl
- #AC_CHECK_LIB([$1$VTK_LIB_SUFFIX], main,
- # [$3="-l$1$VTK_LIB_SUFFIX ${$3}"
- # eval "ac_cv_lib_$1$VTK_LIB_SUFFIX=yes"],
- # [eval "ac_cv_lib_$1$VTK_LIB_SUFFIX=no"],[$4])dnl
- #ac_cv_lib_$1=ac_cv_lib_[]$1[]_main
- #ac_cv_lib_[]AC_Lib_Name()=ac_cv_lib_[]AC_Lib_Name()_main
LIBS="$old_LIBS"
])
@@ -836,7 +821,6 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
AC_LANG_CPLUSPLUS
VTK_INCLUDES=
- #VTK_LIB_SUFFIX=-pv3.98
case "x$WITH_VTK" in
xyes|x)
VTK_LIB_DIR=
@@ -856,9 +840,6 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
for dir in /usr/lib/vtk /usr/lib /usr/bin /usr; do
if test "x" = "x$VTK_LIB_DIR"; then
LIBS="$old_LIBS -L$dir"
- #unset ac_cv_lib_vtkCommon
- #unset ac_cv_lib_vtkCommon_main
- #AC_HAVE_LIBRARY([vtkCommonCore$VTK_LIB_SUFFIX],[VTK_LIB_DIR=$dir])
FATHOM_CHECK_VTK_LIB_LIST([vtkCommonCore],[$VTK_LIB_SUFFIX], [VTK_LIB_DIR],[],[-L$dir])
fi
done
@@ -895,7 +876,6 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
for dir in ${WITH_VTK}/lib ${WITH_VTK}/lib/vtk ${VTK_DIR}/bin ${WITH_VTK}/bin ${WITH_VTK}; do
if test "x" = "x$VTK_LIB_DIR"; then
LIBS="$old_LIBS -L$dir"
- #AC_HAVE_LIBRARY([vtkCommonCore${VTK_LIB_SUFFIX}],[VTK_LIB_DIR=$dir])
FATHOM_CHECK_VTK_LIB_LIST([vtkCommonCore],[$VTK_LIB_SUFFIX], [VTK_LIB_DIR],[],[-L$dir])
fi
done
@@ -921,7 +901,6 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
FATHOM_CHECK_LIB_LIST([GLU],[], [vtk_x_libs],[$x_libs_arg],[-L$x_libraries])
vtk_libs_arg="-L$x_libraries $vtk_x_libs $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $vtk_sys_libs"
- #FATHOM_CHECK_LIB_LIST(vtksys$VTK_LIB_SUFFIX,[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
FATHOM_CHECK_VTK_LIB_LIST([vtksys],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
FATHOM_CHECK_VTK_LIB_LIST([vtkCommonCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
FATHOM_CHECK_VTK_LIB_LIST([vtkDICOMParser],[$VTK_LIB_SUFFIX],[vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
https://bitbucket.org/fathomteam/moab/commits/100cd3e3373a/
Changeset: 100cd3e3373a
Branch: master
User: vijaysm
Date: 2014-02-26 22:13:49
Summary: Merged in vijaysm/moab/autoconf-fixes (pull request #17)
Configuration fixes for HDF5, NetCDF, VTK
Affected #: 3 files
diff --git a/config/hdf5.m4 b/config/hdf5.m4
index 4d3d11d..b603d24 100644
--- a/config/hdf5.m4
+++ b/config/hdf5.m4
@@ -28,16 +28,17 @@ if test "xyes" != "x$HAVE_LIB_HDF5"; then
HAVE_LIB_HDF5=no
FATHOM_HDF5_LIBS_HELPER
+ FATHOM_HDF5_LIBS_HELPER([-ldl])
if test $HAVE_ZLIB = yes; then
- FATHOM_HDF5_LIBS_HELPER([-lz])
- FATHOM_HDF5_LIBS_HELPER([-lz -lpthread])
+ FATHOM_HDF5_LIBS_HELPER([-lz -ldl])
+ FATHOM_HDF5_LIBS_HELPER([-lz -ldl -lpthread])
fi
if test $HAVE_SZIP = yes; then
- FATHOM_HDF5_LIBS_HELPER([-lsz])
- FATHOM_HDF5_LIBS_HELPER([-lsz -lpthread])
+ FATHOM_HDF5_LIBS_HELPER([-lsz -ldl])
+ FATHOM_HDF5_LIBS_HELPER([-lsz -ldl -lpthread])
if test $HAVE_ZLIB = yes; then
- FATHOM_HDF5_LIBS_HELPER([-lsz -lz])
- FATHOM_HDF5_LIBS_HELPER([-lsz -lz -lpthread])
+ FATHOM_HDF5_LIBS_HELPER([-lsz -lz -ldl])
+ FATHOM_HDF5_LIBS_HELPER([-lsz -lz -ldl -lpthread])
fi
fi
fi
diff --git a/config/netcdf.m4 b/config/netcdf.m4
index 041327d..4c13802 100644
--- a/config/netcdf.m4
+++ b/config/netcdf.m4
@@ -85,33 +85,47 @@ if test "xno" != "x$NETCDF_ARG"; then
NETCDF_CPPFLAGS="-I${NETCDF_ARG}"
fi
fi
-
+
+ AC_PATH_PROG([NC_CONFIG], [nc-config], [no], [${NETCDF_ARG}/bin])
+ if test "$NC_CONFIG" != "no" ; then
+ NETCDF_CPPFLAGS="`$NC_CONFIG --cflags`"
+ NETCDF_LDFLAGS="`$NC_CONFIG --libs`"
+ NETCDF_VERSION="`$NC_CONFIG --version`"
+ AC_SUBST([NETCDF_CPPFLAGS])
+ AC_SUBST([NETCDF_LDFLAGS])
+ AC_SUBST([NETCDF_VERSION])
+ else
+ HAVE_NETCDF=no
+ AC_MSG_WARN("NetCDF configuration utility not found")
+ fi
+
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$NETCDF_CPPFLAGS $CPPFLAGS"
old_LDFLAGS="$LDFLAGS"
- LDFLAGS="$NETCDF_LDFLAGS $HDF5_LDFLAGS $LDFLAGS"
+ LDFLAGS="$NETCDF_LDFLAGS $LDFLAGS"
# Check for C library
AC_LANG_PUSH([C])
AC_CHECK_HEADERS( [netcdf.h],
[FATHOM_CHECK_NETCDF_LIMITS([$1],[$2],[netcdf.h],[NETCDF_SUFFICIENT_DIM_VARS])],
[AC_MSG_WARN([[NetCDF header not found.]]); HAVE_NETCDF=no] )
-
+
# Check if netcdf is usable by itself
+ # AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf"], [NETCDF_LIBS=${NETCDF_LDFLAGS}] )
AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf"], [
- # Check if netcdf is usable with HDF5
+ # Check if netcdf is usable with HDF5
unset ac_cv_lib_netcdf
unset ac_cv_lib_netcdf_nc_create
- # If we haven't already looked for HDF5 libraries, again now incase
- # they're in the NetCDF lib directory.
+ # If we haven't already looked for HDF5 libraries, again now incase
+ # they're in the NetCDF lib directory.
FATHOM_DETECT_HDF5_LIBS
LDFLAGS="$LDFLAGS $HDF5_LDFLAGS"
- AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf -lhdf5_hl"], [
+ AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf -lhdf5_hl $HDF5_LIBS"], [
# Try one more time with HDF5 and libcurl
unset ac_cv_lib_netcdf
unset ac_cv_lib_netcdf_nc_create
- AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf -lhdf5_hl -lcurl"],
- [HAVE_NETCDF=no], [-lhdf5_hl $HDF5_LIBS -lcurl] )],
+ AC_CHECK_LIB( [netcdf], [nc_create], [NETCDF_LIBS="-lnetcdf -lhdf5_hl -lcurl "],
+ [HAVE_NETCDF=no], [-lhdf5_hl $HDF5_LIBS -lcurl ] )],
[-lhdf5_hl $HDF5_LIBS] )],
)
diff --git a/configure.ac b/configure.ac
index ea22a5e..82bf72b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -593,13 +593,14 @@ AC_ARG_WITH( [vtk-lib-suffix],
[case "x$withval" in
xyes)
AC_MSG_ERROR([Must specify a non-empty suffix!])
- VTK_LIB_SUFFIX=
+ VTK_LIB_SUFFIX=
;;
xno)
- VTK_LIB_SUFFIX=
+ AC_MSG_ERROR([Must specify a non-empty suffix!])
+ VTK_LIB_SUFFIX=
;;
x*)
- VTK_LIB_SUFFIX="$withval"
+ VTK_LIB_SUFFIX="$withval"
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-vtk-lib-suffix=\"${withval}\""
;;
esac],[VTK_LIB_SUFFIX=] )
@@ -758,6 +759,40 @@ AC_SUBST(ZOLTAN_INC_FLAGS)
EXPORT_LDFLAGS="$ZOLTAN_LIB_FLAGS $EXPORT_LDFLAGS"
+
+dnl Define a function that checks for the existence of a library
+dnl and if it exists, prepends the corresponding link flag to a
+dnl sepecified variable
+dnl Arguments:
+dnl - The library name
+dnl - The name of the variable to which to prepend the library link flag
+dnl - List of extra libraries required for link test
+dnl - Optional library path linker argument (e.g. -L/opt/foo)
+ AC_DEFUN([FATHOM_CHECK_LIB_LIST],[
+ old_LIBS="$LIBS"
+ LIBS="$5 ${$3} $old_LIBS"
+ AC_HAVE_LIBRARY([$1],[$3="-l$1 ${$3}"],[],[$4])
+ LIBS="$old_LIBS"
+ ])
+
+dnl Define a function that checks for the existence of a library
+dnl and if it exists, prepends the corresponding link flag to a
+dnl sepecified variable
+dnl Arguments:
+dnl - The library name
+dnl - The name of the variable to which to prepend the library link flag
+dnl - List of extra libraries required for link test
+dnl - Optional library path linker argument (e.g. -L/opt/foo)
+ AC_DEFUN([FATHOM_CHECK_VTK_LIB_LIST],[
+ old_LIBS="$LIBS"
+ LIBS="$5 ${$3} $old_LIBS"
+ AC_CHECK_LIB([$1$VTK_LIB_SUFFIX], main,
+ [$3="-l$1$VTK_LIB_SUFFIX ${$3}"],
+ [],[$4])dnl
+ LIBS="$old_LIBS"
+ ])
+
+
################################################################################
# VTK for qvdual and/or vtkMOABReader
################################################################################
@@ -786,7 +821,6 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
AC_LANG_CPLUSPLUS
VTK_INCLUDES=
- VTK_LIB_SUFFIX=-pv3.98
case "x$WITH_VTK" in
xyes|x)
VTK_LIB_DIR=
@@ -806,9 +840,7 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
for dir in /usr/lib/vtk /usr/lib /usr/bin /usr; do
if test "x" = "x$VTK_LIB_DIR"; then
LIBS="$old_LIBS -L$dir"
- unset ac_cv_lib_vtkCommon
- unset ac_cv_lib_vtkCommon_main
- AC_HAVE_LIBRARY([vtkCommonCore$VTK_LIB_SUFFIX],[VTK_LIB_DIR=$dir])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkCommonCore],[$VTK_LIB_SUFFIX], [VTK_LIB_DIR],[],[-L$dir])
fi
done
if test "x" = "x$VTK_LIB_DIR"; then
@@ -828,15 +860,15 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
# Check for non-installed VTK source
AC_CHECK_FILE([vtkUnstructuredGrid.h],[
for subdir in . Common Common/DataModel Filtering GenericFiltering Graphics Hybrid Imaging Parallel Patented Rendering Utilities Utilities/vtkexpat Utilities/expat Utilities/DICOMParser Utilties/vtkpng Utilities/vtkzlib Utilities/freetype/include/freetype Wrapping; do
- AC_MSG_CHECKING([for directory ${WITH_VTK}/$subdir])
- if test -d ${WITH_VTK}/$subdir; then
- VTK_INC_DIR="$VTK_INC_DIR -I${WITH_VTK}/$subdir"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi
- done
- ],[AC_MSG_ERROR([VTK includes not found])]
+ AC_MSG_CHECKING([for directory ${WITH_VTK}/$subdir])
+ if test -d ${WITH_VTK}/$subdir; then
+ VTK_INC_DIR="$VTK_INC_DIR -I${WITH_VTK}/$subdir"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ done
+ ],[AC_MSG_ERROR([VTK includes not found])]
)
fi
VTK_INCLUDES="$VTK_INC_DIR"
@@ -844,7 +876,7 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
for dir in ${WITH_VTK}/lib ${WITH_VTK}/lib/vtk ${VTK_DIR}/bin ${WITH_VTK}/bin ${WITH_VTK}; do
if test "x" = "x$VTK_LIB_DIR"; then
LIBS="$old_LIBS -L$dir"
- AC_HAVE_LIBRARY([vtkCommonCore$VTK_LIB_SUFFIX],[VTK_LIB_DIR=$dir])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkCommonCore],[$VTK_LIB_SUFFIX], [VTK_LIB_DIR],[],[-L$dir])
fi
done
if test "x" = "x$VTK_LIB_DIR"; then
@@ -853,22 +885,7 @@ if test "xno" != "x$WITH_VTK" -a "x" != "x$WITH_VTK"; then
LIBS="$old_LIBS"
;;
esac
-
-dnl Define a function that checks for the existence of a library
-dnl and if it exists, prepends the corresponding link flag to a
-dnl sepecified variable
-dnl Arguments:
-dnl - The library name
-dnl - The name of the variable to which to prepend the library link flag
-dnl - List of extra libraries required for link test
-dnl - Optional library path linker argument (e.g. -L/opt/foo)
- AC_DEFUN([FATHOM_CHECK_LIB_LIST],[
- old_LIBS="$LIBS"
- LIBS="$5 ${$3} $old_LIBS"
- AC_HAVE_LIBRARY([$1$2],[$3="-l$1$2 ${$3}"],[],[$4])
- LIBS="$old_LIBS"
- ])
-
+
# These are ordered such that a given library depends only on those libraries
# that preceed it in the list.
FATHOM_CHECK_LIB_LIST([pthread],[],[vtk_sys_libs])
@@ -883,27 +900,28 @@ dnl - Optional library path linker argument (e.g. -L/opt/foo)
FATHOM_CHECK_LIB_LIST([GL],[], [vtk_x_libs],[$x_libs_arg],[-L$x_libraries])
FATHOM_CHECK_LIB_LIST([GLU],[], [vtk_x_libs],[$x_libs_arg],[-L$x_libraries])
vtk_libs_arg="-L$x_libraries $vtk_x_libs $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $vtk_sys_libs"
- FATHOM_CHECK_LIB_LIST([vtksys],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkCommonCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkDICOMParser],[$VTK_LIB_SUFFIX],[vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkfreetype],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkexpat],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkzlib],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkpng],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkjpeg],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtktiff],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkftgl],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkFiltering],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkImaging],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([verdict],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkGraphics],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkNetCDF],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkexoIIc],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkmetaio],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkIO],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkRendering],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkParallel],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
- FATHOM_CHECK_LIB_LIST([vtkHybrid],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+
+ FATHOM_CHECK_VTK_LIB_LIST([vtksys],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkCommonCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkDICOMParser],[$VTK_LIB_SUFFIX],[vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkfreetype],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkexpat],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkzlib],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkpng],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkjpeg],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtktiff],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkftgl],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkFiltersCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkImagingCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([verdict],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkGraphics],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkNetCDF],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkexoIIc],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkmetaio],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkIOCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkRenderingCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ FATHOM_CHECK_VTK_LIB_LIST([vtkParallelCore],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
+ #FATHOM_CHECK_VTK_LIB_LIST([vtkHybrid],[$VTK_LIB_SUFFIX], [vtk_libs],[$vtk_libs_arg],[-L$VTK_LIB_DIR])
# Make sure we found at least vtkCommonCore and vtkRendering
if ! echo "x $vtk_libs" | grep lvtkCommonCore >/dev/null; then
Repository URL: https://bitbucket.org/fathomteam/moab/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the moab-dev
mailing list