COIN-OR::LEMON - Graph Library

Changeset 666:ec817dfc2cb7 in lemon


Ignore:
Timestamp:
04/23/09 08:28:56 (11 years ago)
Author:
Akos Ladanyi <ladanyi@…>
Branch:
default
Phase:
public
Message:

FindGLPK improvements (#256)

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r599 r666  
    2626# C4996: 'function': was declared deprecated
    2727ENDIF(MSVC)
    28 
    29 IF(GLPK_FOUND)
    30   SET(HAVE_LP TRUE)
    31   SET(HAVE_MIP TRUE)
    32   SET(HAVE_GLPK TRUE)
    33 ENDIF(GLPK_FOUND)
    3428
    3529INCLUDE(CheckTypeSize)
  • cmake/FindGLPK.cmake

    r496 r666  
    1414
    1515IF(GLPK_FOUND)
     16  SET(GLPK_INCLUDE_DIRS ${GLPK_INCLUDE_DIR})
    1617  SET(GLPK_LIBRARIES ${GLPK_LIBRARY})
    1718  SET(GLPK_BIN_DIR ${GLPK_ROOT_PATH}/bin)
     
    1920
    2021MARK_AS_ADVANCED(GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_BIN_DIR)
     22
     23IF(GLPK_FOUND)
     24  SET(HAVE_LP TRUE)
     25  SET(HAVE_MIP TRUE)
     26  SET(HAVE_GLPK TRUE)
     27ENDIF(GLPK_FOUND)
  • lemon/CMakeLists.txt

    r596 r666  
    2121IF(HAVE_GLPK)
    2222  SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
    23   INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})
     23  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIRS})
    2424  IF(WIN32)
    2525    INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)
  • test/CMakeLists.txt

    r658 r666  
    33  ${PROJECT_BINARY_DIR}
    44)
    5 
    6 IF(HAVE_GLPK)
    7   INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})
    8 ENDIF(HAVE_GLPK)
    95
    106LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)
Note: See TracChangeset for help on using the changeset viewer.