Changeset 619:ec817dfc2cb7 in lemon-main

Timestamp:

04/23/09 08:28:56 (17 years ago)

Author:

Akos Ladanyi <ladanyi@…>

Branch:

default

Phase:

public

Message:

FindGLPK improvements (#256)

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/FindGLPK.cmake (modified) (2 diffs)
• lemon/CMakeLists.txt (modified) (1 diff)
• test/CMakeLists.txt (modified) (1 diff)

CMakeLists.txt

@@ -26 +26 @@
 # C4996: 'function': was declared deprecated
 ENDIF(MSVC)
-
-IF(GLPK_FOUND)
-  SET(HAVE_LP TRUE)
-  SET(HAVE_MIP TRUE)
-  SET(HAVE_GLPK TRUE)
-ENDIF(GLPK_FOUND)
 
 INCLUDE(CheckTypeSize)

cmake/FindGLPK.cmake

@@ -14 +14 @@
 
 IF(GLPK_FOUND)
+  SET(GLPK_INCLUDE_DIRS ${GLPK_INCLUDE_DIR})
   SET(GLPK_LIBRARIES ${GLPK_LIBRARY})
   SET(GLPK_BIN_DIR ${GLPK_ROOT_PATH}/bin)
@@ -19 +20 @@
 
 MARK_AS_ADVANCED(GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_BIN_DIR)
+
+IF(GLPK_FOUND)
+  SET(HAVE_LP TRUE)
+  SET(HAVE_MIP TRUE)
+  SET(HAVE_GLPK TRUE)
+ENDIF(GLPK_FOUND)

lemon/CMakeLists.txt

@@ -21 +21 @@
 IF(HAVE_GLPK)
   SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
-  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIRS})
   IF(WIN32)
     INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)

test/CMakeLists.txt

@@ -3 +3 @@
   ${PROJECT_BINARY_DIR}
 )
-
-IF(HAVE_GLPK)
-  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})
-ENDIF(HAVE_GLPK)
 
 LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)