Commit 7c6a490d authored by incardon's avatar incardon

Latest modules

parent 180362e9
......@@ -18,6 +18,7 @@ set(TINYOBJLOADER_ROOT CACHE PATH "TinyObjLoader library path")
set(SE_CLASS1 CACHE BOOL "Activate compilation with SE_CLASS1")
set(SE_CLASS2 CACHE BOOL "Activate compilation with SE_CLASS2")
set(SE_CLASS3 CACHE BOOL "Activate compilation with SE_CLASS3")
set(ACTION_ON_ERROR CACHE STRING "Action to perform in case of error")
set(PROFILE_WITH_SCOREP CACHE BOOL "Enable profiling with scorep")
set(ENV{PETSC_DIR} ${PETSC_ROOT})
set(ENV{HDF5_ROOT} ${HDF5_ROOT})
......@@ -83,6 +84,10 @@ if(SE_CLASS1)
set(DEFINE_SE_CLASS1 "#define SE_CLASS1")
endif()
if(ACTION_ON_ERROR)
set(DEFINE_ACTION_ON_ERROR "#define ${ACTION_ON_ERROR}")
endif()
if(SE_CLASS2)
set(DEFINE_SE_CLASS2 "#define SE_CLASS2")
endif()
......
......@@ -92,7 +92,7 @@ fi
foward_options=
if [ x"$comp_type" == x"se_class" ]; then
foward_options="--enable-se-class1"
foward_options="--enable-se-class1 --with-action-on-error=STOP_ON_ERROR"
fi
......
......@@ -475,6 +475,9 @@ do
boost)
conf_options="$conf_options -DBOOST_ROOT=$ac_optarg"
;;
action_on_error)
conf_options="$conf_options -DACTION_ON_ERROR=$ac_optarg"
;;
mpivendor)
conf_options="$conf_options -DMPI_VENDOR=$ac_optarg"
;;
......
openfpm_data @ da7bebf0
Subproject commit 575d1b6ae02a4edc7920f06514e3a242d6c0418b
Subproject commit da7bebf0e5101b3e0e85e42695d755d843f7c418
......@@ -107,6 +107,9 @@ ${DEFINE_HAVE_UNISTD_H}
/* Test TinyObjLoader */
${DEFINE_HAVE_TINYOBJLOADER}
/* ACTION to take in case of error */
${DEFINE_ACTION_ON_ERROR}
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"
......
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