Skip to content
Snippets Groups Projects
Commit 6d7ddcff authored by Pietro Incardona's avatar Pietro Incardona
Browse files

Fixing PETSC order

parent 2532e3af
No related branches found
No related tags found
No related merge requests found
...@@ -97,12 +97,13 @@ AC_DEFUN([AX_LIB_PETSC], [ ...@@ -97,12 +97,13 @@ AC_DEFUN([AX_LIB_PETSC], [
# #
# locate PETSC library # locate PETSC library
# #
if test -n "$with_petsc" ; then if test -n "$with_petsc" ; then
old_CC=$CC old_CC=$CC
old_CFLAGS=$CFLAGS old_CFLAGS=$CFLAGS
old_LDFLAGS=$LDFLAGS old_LDFLAGS=$LDFLAGS
CFLAGS="-I$with_petsc/include" CFLAGS="-I$with_petsc/include"
LDFLAGS="-L$with_petsc/lib" LDFLAGS="-L$with_petsc/lib "
CC=$CXX CC=$CXX
AC_LANG_SAVE AC_LANG_SAVE
...@@ -132,7 +133,7 @@ AC_MSG_WARN([could not find header file petsc.h])) ...@@ -132,7 +133,7 @@ AC_MSG_WARN([could not find header file petsc.h]))
# #
# #
if test x = x"$PETSC_LIB" ; then if test x = x"$PETSC_LIB" ; then
ifelse([$2],,[AC_MSG_ERROR(Failed to find valid PETSC library)],[$2]) ifelse([$2],,[],[$2])
: :
else else
ifelse([$1],,[],[$1]) ifelse([$1],,[],[$1])
......
...@@ -45,9 +45,11 @@ AC_DEFUN([IMMDX_LIB_PARMETIS], [ ...@@ -45,9 +45,11 @@ AC_DEFUN([IMMDX_LIB_PARMETIS], [
old_CC=$CC old_CC=$CC
old_CFLAGS=$CFLAGS old_CFLAGS=$CFLAGS
old_LDFLAGS=$LDFLAGS old_LDFLAGS=$LDFLAGS
old_LIBS=$LIBS
CFLAGS="-I$with_parmetis/include -I$with_metis/include" CFLAGS="-I$with_parmetis/include -I$with_metis/include"
LDFLAGS="-L$with_parmetis/lib -L$with_metis/lib" LDFLAGS="-L$with_parmetis/lib -L$with_metis/lib"
CC=$CXX CC=$CXX
LIBS="-lmetis"
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_C AC_LANG_C
...@@ -62,6 +64,7 @@ AC_DEFUN([IMMDX_LIB_PARMETIS], [ ...@@ -62,6 +64,7 @@ AC_DEFUN([IMMDX_LIB_PARMETIS], [
CFLAGS=$old_CFLAGS CFLAGS=$old_CFLAGS
LDFLAGS=$old_LDFLAGS LDFLAGS=$old_LDFLAGS
CC=$old_CC CC=$old_CC
LIBS=$old_LIBS
AC_MSG_CHECKING(PARMETIS in $with_parmetis) AC_MSG_CHECKING(PARMETIS in $with_parmetis)
if test "$parmetis_lib" = "yes" -a "$parmetis_h" = "yes" ; then if test "$parmetis_lib" = "yes" -a "$parmetis_h" = "yes" ; then
......
LINKLIBS = $(SUITESPARSE_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(METIS_LIB) $(PARMETIS_LIB) $(DEFAULT_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_IOSTREAMS_LIB) $(HDF5_LDFLAGS) $(HDF5_LIBS) $(LIBQUADMATH) $(PETSC_LIB) LINKLIBS = $(PETSC_LIB) $(SUITESPARSE_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(METIS_LIB) $(PARMETIS_LIB) $(DEFAULT_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_IOSTREAMS_LIB) $(HDF5_LDFLAGS) $(HDF5_LIBS) $(LIBQUADMATH) $(PETSC_LIB)
noinst_PROGRAMS = numerics noinst_PROGRAMS = numerics
numerics_SOURCES = main.cpp ../../openfpm_vcluster/src/VCluster.cpp ../../openfpm_devices/src/memory/HeapMemory.cpp ../../openfpm_devices/src/memory/PtrMemory.cpp ../../openfpm_devices/src/Memleak_check.cpp numerics_SOURCES = main.cpp ../../openfpm_vcluster/src/VCluster.cpp ../../openfpm_devices/src/memory/HeapMemory.cpp ../../openfpm_devices/src/memory/PtrMemory.cpp ../../openfpm_devices/src/Memleak_check.cpp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment