1.1 --- a/CMakeLists.txt	Tue Apr 21 15:18:54 2009 +0100
     1.2 +++ b/CMakeLists.txt	Thu Apr 23 07:28:56 2009 +0100
     1.3 @@ -26,12 +26,6 @@
     1.4  # C4996: 'function': was declared deprecated
     1.5  ENDIF(MSVC)
     1.6  
     1.7 -IF(GLPK_FOUND)
     1.8 -  SET(HAVE_LP TRUE)
     1.9 -  SET(HAVE_MIP TRUE)
    1.10 -  SET(HAVE_GLPK TRUE)
    1.11 -ENDIF(GLPK_FOUND)
    1.12 -
    1.13  INCLUDE(CheckTypeSize)
    1.14  CHECK_TYPE_SIZE("long long" LONG_LONG)
    1.15  

     2.1 --- a/cmake/FindGLPK.cmake	Tue Apr 21 15:18:54 2009 +0100
     2.2 +++ b/cmake/FindGLPK.cmake	Thu Apr 23 07:28:56 2009 +0100
     2.3 @@ -13,8 +13,15 @@
     2.4  FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLPK DEFAULT_MSG GLPK_LIBRARY GLPK_INCLUDE_DIR)
     2.5  
     2.6  IF(GLPK_FOUND)
     2.7 +  SET(GLPK_INCLUDE_DIRS ${GLPK_INCLUDE_DIR})
     2.8    SET(GLPK_LIBRARIES ${GLPK_LIBRARY})
     2.9    SET(GLPK_BIN_DIR ${GLPK_ROOT_PATH}/bin)
    2.10  ENDIF(GLPK_FOUND)
    2.11  
    2.12  MARK_AS_ADVANCED(GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_BIN_DIR)
    2.13 +
    2.14 +IF(GLPK_FOUND)
    2.15 +  SET(HAVE_LP TRUE)
    2.16 +  SET(HAVE_MIP TRUE)
    2.17 +  SET(HAVE_GLPK TRUE)
    2.18 +ENDIF(GLPK_FOUND)

     3.1 --- a/lemon/CMakeLists.txt	Tue Apr 21 15:18:54 2009 +0100
     3.2 +++ b/lemon/CMakeLists.txt	Thu Apr 23 07:28:56 2009 +0100
     3.3 @@ -20,7 +20,7 @@
     3.4  
     3.5  IF(HAVE_GLPK)
     3.6    SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
     3.7 -  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})
     3.8 +  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIRS})
     3.9    IF(WIN32)
    3.10      INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)
    3.11      INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)

     4.1 --- a/test/CMakeLists.txt	Tue Apr 21 15:18:54 2009 +0100
     4.2 +++ b/test/CMakeLists.txt	Thu Apr 23 07:28:56 2009 +0100
     4.3 @@ -3,10 +3,6 @@
     4.4    ${PROJECT_BINARY_DIR}
     4.5  )
     4.6  
     4.7 -IF(HAVE_GLPK)
     4.8 -  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})
     4.9 -ENDIF(HAVE_GLPK)
    4.10 -
    4.11  LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)
    4.12  
    4.13  SET(TESTS