Changeset 2469


Ignore:
Timestamp:
Oct 15, 2011 2:15:24 PM (10 years ago)
Author:
stefan
Message:

make metis optional

Location:
ThirdParty/HSL/trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/trunk/Makefile.am

    r2461 r2469  
    5656  libcoinhsl_la_SOURCES += hsl_ma97/hsl_ma97d.f90 hsl_ma97/C/hsl_ma97d_ciface.f90
    5757  includecoin_HEADERS += hsl_ma97/C/hsl_ma97d.h
     58endif
     59
     60if COIN_HAS_METIS
     61else
     62  libcoinhsl_la_SOURCES += metis_dummy.c
    5863endif
    5964
  • ThirdParty/HSL/trunk/Makefile.in

    r2461 r2469  
    6565@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA97_TRUE@am__append_11 = hsl_ma97/hsl_ma97d.f90 hsl_ma97/C/hsl_ma97d_ciface.f90
    6666@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA97_TRUE@am__append_12 = hsl_ma97/C/hsl_ma97d.h
     67@BUILD_COINHSL_TRUE@@COIN_HAS_METIS_FALSE@am__append_13 = metis_dummy.c
    6768DIST_COMMON = $(am__configure_deps) $(am__includecoin_HEADERS_DIST) \
    6869        $(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
     
    7172        $(srcdir)/config_coinhsl.h.in $(top_srcdir)/configure \
    7273        config.guess config.sub depcomp install-sh ltmain.sh missing
    73 @HAVE_EXTERNALS_TRUE@am__append_13 = Dependencies
    74 @HAVE_EXTERNALS_TRUE@am__append_14 = .Dependencies-stamp
     74@HAVE_EXTERNALS_TRUE@am__append_14 = Dependencies
     75@HAVE_EXTERNALS_TRUE@am__append_15 = .Dependencies-stamp
    7576subdir = .
    7677ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    99100        hsl_mc68/C/hsl_mc68i_ciface.f90 hsl_ma77/hsl_ma77d.f90 \
    100101        hsl_ma86/hsl_ma86d.f90 hsl_ma86/C/hsl_ma86d_ciface.f90 \
    101         hsl_ma97/hsl_ma97d.f90 hsl_ma97/C/hsl_ma97d_ciface.f90
     102        hsl_ma97/hsl_ma97d.f90 hsl_ma97/C/hsl_ma97d_ciface.f90 \
     103        metis_dummy.c
    102104@BUILD_COINHSL_TRUE@@COIN_HAS_MC19_TRUE@am__objects_1 = mc19d.lo
    103105@BUILD_COINHSL_TRUE@@COIN_HAS_MA27_TRUE@am__objects_2 = ma27d.lo
     
    114116@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA97_TRUE@    hsl_ma97d.lo \
    115117@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA97_TRUE@    hsl_ma97d_ciface.lo
     118@BUILD_COINHSL_TRUE@@COIN_HAS_METIS_FALSE@am__objects_10 =  \
     119@BUILD_COINHSL_TRUE@@COIN_HAS_METIS_FALSE@      metis_dummy.lo
    116120@BUILD_COINHSL_TRUE@am_libcoinhsl_la_OBJECTS = deps.lo \
    117121@BUILD_COINHSL_TRUE@    $(am__objects_1) $(am__objects_2) \
     
    119123@BUILD_COINHSL_TRUE@    $(am__objects_5) $(am__objects_6) \
    120124@BUILD_COINHSL_TRUE@    $(am__objects_7) $(am__objects_8) \
    121 @BUILD_COINHSL_TRUE@    $(am__objects_9)
     125@BUILD_COINHSL_TRUE@    $(am__objects_9) $(am__objects_10)
    122126libcoinhsl_la_OBJECTS = $(am_libcoinhsl_la_OBJECTS)
    123127@BUILD_COINHSL_TRUE@am_libcoinhsl_la_rpath = -rpath $(libdir)
    124128DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I.
     129depcomp = $(SHELL) $(top_srcdir)/depcomp
     130am__depfiles_maybe = depfiles
     131COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     132        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     133LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
     134        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     135        $(AM_CFLAGS) $(CFLAGS)
     136CCLD = $(CC)
     137LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     138        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    125139F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS)
    126140LTF77COMPILE = $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) \
     
    356370target_alias = @target_alias@
    357371AUTOMAKE_OPTIONS = foreign
    358 EXTRA_DIST = INSTALL.HSL $(am__append_13)
     372EXTRA_DIST = INSTALL.HSL $(am__append_14)
    359373@BUILD_COINHSL_TRUE@includecoindir = $(includedir)/coin/ThirdParty
    360374@BUILD_COINHSL_TRUE@includecoin_HEADERS = $(am__append_7) \
     
    366380@BUILD_COINHSL_TRUE@    $(am__append_5) $(am__append_6) \
    367381@BUILD_COINHSL_TRUE@    $(am__append_8) $(am__append_9) \
    368 @BUILD_COINHSL_TRUE@    $(am__append_11)
     382@BUILD_COINHSL_TRUE@    $(am__append_11) $(am__append_13)
    369383@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@nodist_includecoin_HEADERS = hsl_ma77_double.mod
    370384@BUILD_COINHSL_TRUE@libcoinhsl_la_LDFLAGS = $(LT_LDFLAGS)
     
    382396
    383397# Files that are generated and should be cleaned with make distclean
    384 DISTCLEANFILES = $(am__append_14) $(VPATH_DISTCLEANFILES)
     398DISTCLEANFILES = $(am__append_15) $(VPATH_DISTCLEANFILES)
    385399DocFiles = README AUTHORS LICENSE
    386400DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     
    389403
    390404.SUFFIXES:
    391 .SUFFIXES: .f .f90 .lo .o .obj
     405.SUFFIXES: .c .f .f90 .lo .o .obj
    392406am--refresh:
    393407        @:
     
    489503distclean-compile:
    490504        -rm -f *.tab.c
     505
     506@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metis_dummy.Plo@am__quote@
     507
     508.c.o:
     509@am__fastdepCC_TRUE@    if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     510@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     511@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     512@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     513@am__fastdepCC_FALSE@   $(COMPILE) -c $<
     514
     515.c.obj:
     516@am__fastdepCC_TRUE@    if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
     517@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     518@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     519@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     520@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
     521
     522.c.lo:
     523@am__fastdepCC_TRUE@    if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     524@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     525@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     526@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     527@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
    491528
    492529.f.o:
     
    823860distclean: distclean-am
    824861        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
     862        -rm -rf ./$(DEPDIR)
    825863        -rm -f Makefile
    826864distclean-am: clean-am distclean-compile distclean-generic \
     
    851889        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    852890        -rm -rf $(top_srcdir)/autom4te.cache
     891        -rm -rf ./$(DEPDIR)
    853892        -rm -f Makefile
    854893maintainer-clean-am: distclean-am maintainer-clean-generic
  • ThirdParty/HSL/trunk/configure

    r2463 r2469  
    2572725727fi
    2572825728
    25729 # MA57, MA77, and MC68 require Metis
     25729# MA57, MA77, and MC68 can use Metis
     25730# if Metis is not available, then we compile a dummy metis.f that defines the Metis function symbol
    2573025731if test $coin_has_ma57$coin_has_hsl_ma77$coin_has_hsl_mc68 != nonono ; then
    2573125732
     
    2624026241
    2624126242
    26242   if test $coin_has_metis != yes ; then
    26243     { { echo "$as_me:$LINENO: error: Required package METIS not found." >&5
    26244 echo "$as_me: error: Required package METIS not found." >&2;}
    26245    { (exit 1); exit 1; }; }
    26246   fi
    26247 else
    26248 
    26249 
    26250 if test 0 = 1; then
     26243else
     26244  # do as if we had metis, so metis.f is not compiled
     26245
     26246
     26247if test 1 = 1; then
    2625126248  COIN_HAS_METIS_TRUE=
    2625226249  COIN_HAS_METIS_FALSE='#'
  • ThirdParty/HSL/trunk/configure.ac

    r2463 r2469  
    183183fi
    184184
    185 # MA57, MA77, and MC68 require Metis
     185# MA57, MA77, and MC68 can use Metis
     186# if Metis is not available, then we compile a dummy metis.f that defines the Metis function symbol
    186187if test $coin_has_ma57$coin_has_hsl_ma77$coin_has_hsl_mc68 != nonono ; then
    187188  AC_COIN_CHECK_PACKAGE(Metis, [coinmetis], HSL)
    188   if test $coin_has_metis != yes ; then
    189     AC_MSG_ERROR([Required package METIS not found.])
    190   fi
    191 else
    192   AM_CONDITIONAL(COIN_HAS_METIS, [test 0 = 1])
     189else
     190  # do as if we had metis, so metis.f is not compiled
     191  AM_CONDITIONAL(COIN_HAS_METIS, [test 1 = 1])
    193192fi
    194193
Note: See TracChangeset for help on using the changeset viewer.