COIN-OR::LEMON - Graph Library

Changeset 508:861a9d5ff283 in lemon-1.2 for configure.ac


Ignore:
Timestamp:
01/23/09 17:42:07 (11 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
509:c5919679af17, 512:9b9ffe7d9b75
Parents:
507:e6ae4999cf22 (diff), 478:64c2641286df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge (manually add cmake/FindGLPK.cmake to Makefile.am)

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r478 r508  
    1919AC_CONFIG_SRCDIR([lemon/list_graph.h])
    2020AC_CONFIG_HEADERS([config.h lemon/config.h])
    21 
    22 lx_cmdline_cxxflags_set=${CXXFLAGS+set}
    2321
    2422dnl Do compilation tests using the C++ compiler.
     
    4745
    4846dnl Set custom compiler flags when using g++.
    49 if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes -a "$ICC" = no; then
    50   CXXFLAGS="$CXXFLAGS -Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"
     47if test "$GXX" = yes -a "$ICC" = no; then
     48  WARNINGCXXFLAGS="-Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"
    5149fi
     50AC_SUBST([WARNINGCXXFLAGS])
    5251
    5352dnl Checks for libraries.
    54 #LX_CHECK_GLPK
    55 #LX_CHECK_CPLEX
    56 #LX_CHECK_SOPLEX
     53LX_CHECK_GLPK
     54LX_CHECK_CPLEX
     55LX_CHECK_SOPLEX
     56LX_CHECK_CLP
     57
     58AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"])
     59AM_CONDITIONAL([HAVE_MIP], [test x"$lx_mip_found" = x"yes"])
    5760
    5861dnl Disable/enable building the demo programs.
     
    115118echo
    116119echo C++ compiler.................. : $CXX
    117 echo C++ compiles flags............ : $CXXFLAGS
     120echo C++ compiles flags............ : $WARNINGCXXFLAGS $CXXFLAGS
    118121echo
    119 #echo GLPK support.................. : $lx_glpk_found
    120 #echo CPLEX support................. : $lx_cplex_found
    121 #echo SOPLEX support................ : $lx_soplex_found
    122 #echo
     122echo GLPK support.................. : $lx_glpk_found
     123echo CPLEX support................. : $lx_cplex_found
     124echo SOPLEX support................ : $lx_soplex_found
     125echo CLP support................... : $lx_clp_found
     126echo
    123127echo Build demo programs........... : $enable_demo
    124128echo Build additional tools........ : $enable_tools
  • configure.ac

    r459 r508  
    101101dnl Add dependencies on files generated by configure.
    102102AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
    103   ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in'])
     103  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
    104104
    105105AC_CONFIG_FILES([
    106106Makefile
     107cmake/version.cmake
    107108doc/Doxyfile
    108109lemon/lemon.pc
Note: See TracChangeset for help on using the changeset viewer.