Commit c980d11c authored by prudhomm's avatar prudhomm
Browse files

updated to make application work

use program_options from boost 1.32 but make it optional
parent 7829cdd3
......@@ -2,7 +2,7 @@
# DO NOT EDIT : generated automatically by update-headers
#
LIFECORE_HDRS=life/lifecore/dataString.hpp life/lifecore/fortran_wrap.hpp life/lifecore/singleton.hpp life/lifecore/lifeassert.hpp life/lifecore/SmartAssert.hpp life/lifecore/life.hpp life/lifecore/util_string.hpp life/lifecore/policy.hpp life/lifecore/debug.hpp life/lifecore/GetPot.hpp life/lifecore/typeInfo.hpp life/lifecore/chrono.hpp life/lifecore/switch.hpp life/lifecore/lifemacros.hpp life/lifecore/lifeversion.hpp life/lifecore/factory.hpp
LIFECORE_HDRS=life/lifecore/dataString.hpp life/lifecore/fortran_wrap.hpp life/lifecore/singleton.hpp life/lifecore/about.hpp life/lifecore/application.hpp life/lifecore/lifeassert.hpp life/lifecore/SmartAssert.hpp life/lifecore/life.hpp life/lifecore/util_string.hpp life/lifecore/policy.hpp life/lifecore/debug.hpp life/lifecore/GetPot.hpp life/lifecore/typeInfo.hpp life/lifecore/chrono.hpp life/lifecore/switch.hpp life/lifecore/lifemacros.hpp life/lifecore/lifeversion.hpp life/lifecore/factory.hpp
LIFEARRAY_HDRS=life/lifearray/CSRMatrix.hpp life/lifearray/pattern.hpp life/lifearray/RNM_opc.hpp life/lifearray/variables.hpp life/lifearray/tridiagMatrix.hpp life/lifearray/MSRMatrix.hpp life/lifearray/elemVec.hpp life/lifearray/SimpleVect.hpp life/lifearray/tab.hpp life/lifearray/connectivity.hpp life/lifearray/blockMatrix.hpp life/lifearray/MixedMatrix.hpp life/lifearray/RNM.hpp life/lifearray/elemMat.hpp life/lifearray/RNM_tpl.hpp life/lifearray/RNM_op.hpp life/lifearray/vecUnknown.hpp life/lifearray/sparseArray.hpp life/lifearray/VBRMatrix.hpp life/lifearray/boostmatrix.hpp
......
......@@ -62,6 +62,9 @@ AC_CHECK_BOOST_SIGNALS
AC_CHECK_BOOST_REGEX
AC_CHECK_BOOST_UNIT_TEST_FRAMEWORK
AC_CHECK_BOOST_PROGRAM_OPTIONS
AM_CONDITIONAL(HAVE_BOOST_PROGRAM_OPTIONS, test x$boost_program_options_error=xno)
dnl
......
......@@ -26,12 +26,17 @@ AM_CPPFLAGS = -I$(top_srcdir)
lib_LTLIBRARIES = liblifecore.la
liblifecore_la_SOURCES = lifeversion.cpp\
liblifecore_la_SOURCES = about.cpp lifeversion.cpp\
GetPot.cpp dataString.cpp debug.cpp \
switch.cpp util_string.cpp typeInfo.cpp\
SmartAssert.cpp
SmartAssert.cpp
liblifecore_la_LIBADD = $(aztec_libs)
if HAVE_BOOST_PROGRAM_OPTIONS
liblifecore_la_SOURCES += application.cpp
liblifecore_la_LIBADD += $(boost_program_options_lib)
endif
liblifecore_la_LIBADD = $(aztec_libs)
include $(top_srcdir)/admin/Doxyfile.am
Supports Markdown
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