COIN-OR::LEMON - Graph Library

Changeset 508:861a9d5ff283 in lemon-1.2


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:
6 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r478 r508  
    1414INCLUDE(FindDoxygen)
    1515INCLUDE(FindGhostscript)
     16FIND_PACKAGE(GLPK 4.33)
     17
     18ADD_DEFINITIONS(-DHAVE_CONFIG_H)
     19
     20IF(MSVC)
     21  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996")
     22# Suppressed warnings:
     23# C4250: 'class1' : inherits 'class2::member' via dominance
     24# C4355: 'this' : used in base member initializer list
     25# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
     26# C4996: 'function': was declared deprecated
     27ENDIF(MSVC)
     28
     29IF(GLPK_FOUND)
     30  SET(HAVE_LP TRUE)
     31  SET(HAVE_MIP TRUE)
     32  SET(HAVE_GLPK TRUE)
     33ENDIF(GLPK_FOUND)
    1634
    1735ENABLE_TESTING()
  • CMakeLists.txt

    r507 r508  
    11CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
    22
    3 SET(PROJECT_NAME "LEMON")
    4 SET(PROJECT_VERSION "hg-tip" CACHE STRING "The version string.")
     3IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
     4  INCLUDE(${CMAKE_SOURCE_DIR}/cmake/version.cmake)
     5ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
     6  SET(PROJECT_NAME "LEMON")
     7  SET(PROJECT_VERSION "hg-tip" CACHE STRING "LEMON version string.")
     8ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
    59
    610PROJECT(${PROJECT_NAME})
     
    3741
    3842IF(WIN32)
    39   INSTALL(FILES ${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico
    40     DESTINATION bin)
    41 ENDIF(WIN32)
    42 
    43 IF(WIN32)
    4443  SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
    45   SET(CPACK_PACKAGE_VENDOR
    46     "EGRES - Egervary Research Group on Combinatorial Optimization")
     44  SET(CPACK_PACKAGE_VENDOR "EGRES")
    4745  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
    4846    "LEMON - Library of Efficient Models and Optimization in Networks")
     
    5654    "${PROJECT_NAME} ${PROJECT_VERSION}")
    5755
    58   # Variables to generate a component-based installer.
    59   #SET(CPACK_COMPONENTS_ALL headers library html_documentation)
     56  SET(CPACK_COMPONENTS_ALL headers library html_documentation)
    6057
    61   #SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
    62   #SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Static library")
    63   #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
     58  SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
     59  SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library")
     60  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
    6461
    65   #SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
    66   #  "C++ header files for use with the LEMON library")
    67   #SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
    68   #  "Static library used to build programs with LEMON")
    69   #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
    70   #  "Doxygen generated documentation")
     62  SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
     63    "C++ header files")
     64  SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
     65    "DLL and import library")
     66  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
     67    "Doxygen generated documentation")
    7168
    72   #SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
     69  SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
    7370
    74   #SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
    75   #SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
    76   #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
     71  SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
     72  SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
     73  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
    7774
    78   #SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
    79   #  "Components needed to develop software using LEMON")
    80   #SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
    81   #  "Documentation of LEMON")
     75  SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
     76    "Components needed to develop software using LEMON")
     77  SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
     78    "Documentation of LEMON")
    8279
    83   #SET(CPACK_ALL_INSTALL_TYPES Full Developer)
     80  SET(CPACK_ALL_INSTALL_TYPES Full Developer)
    8481
    85   #SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
    86   #SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
    87   #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
     82  SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
     83  SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
     84  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
    8885
    8986  SET(CPACK_GENERATOR "NSIS")
  • Makefile.am

    r478 r508  
    11ACLOCAL_AMFLAGS = -I m4
     2
     3AM_CXXFLAGS = $(WARNINGCXXFLAGS)
    24
    35AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
     
    1214        CMakeLists.txt \
    1315        cmake/FindGhostscript.cmake \
     16        cmake/FindGLPK.cmake \
    1417        cmake/version.cmake.in \
    1518        cmake/version.cmake \
  • Makefile.am

    r363 r508  
    1313        m4/lx_check_soplex.m4 \
    1414        CMakeLists.txt \
    15         cmake
     15        cmake/FindGhostscript.cmake \
     16        cmake/FindGLPK.cmake \
     17        cmake/version.cmake.in \
     18        cmake/version.cmake \
     19        cmake/nsis/lemon.ico \
     20        cmake/nsis/uninstall.ico
    1621
    1722pkgconfigdir = $(libdir)/pkgconfig
  • 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.