Changeset 474:f59df77f5c8d in lemon-main

Timestamp:

01/21/09 19:08:31 (16 years ago)

Author:

Akos Ladanyi <ladanyi@…>

Branch:

default

Phase:

public

Message:

Fix CMAKE build without GLPK

Files:

• demo/CMakeLists.txt (modified) (1 diff)
• lemon/CMakeLists.txt (modified) (3 diffs)
• test/CMakeLists.txt (modified) (4 diffs)

demo/CMakeLists.txt

@@ -2 +2 @@
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${GLPK_INCLUDE_DIR}
 )
 

lemon/CMakeLists.txt

@@ -2 +2 @@
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${GLPK_INCLUDE_DIR}
 )
 
@@ -20 +19 @@
 IF(HAVE_GLPK)
   SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
+  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})
+  IF(WIN32)
+    INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)
+    INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)
+    INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
+  ENDIF(WIN32)
 ENDIF(HAVE_GLPK)
 
@@ -34 +39 @@
   COMPONENT headers
   FILES_MATCHING PATTERN "*.h")
-
-IF(WIN32)
-  INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)
-  INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)
-  INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
-ENDIF(WIN32)

test/CMakeLists.txt

@@ -2 +2 @@
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${GLPK_INCLUDE_DIR}
 )
+
+IF(HAVE_GLPK)
+  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})
+ENDIF(HAVE_GLPK)
 
 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
@@ -36 +39 @@
 IF(HAVE_LP)
   ADD_EXECUTABLE(lp_test lp_test.cc)
-  TARGET_LINK_LIBRARIES(lp_test lemon ${GLPK_LIBRARIES})
+  IF(HAVE_GLPK)
+    TARGET_LINK_LIBRARIES(lp_test lemon ${GLPK_LIBRARIES})
+  ENDIF(HAVE_GLPK)
   ADD_TEST(lp_test lp_test)
 
-  IF(WIN32)
+  IF(WIN32 AND HAVE_GLPK)
     GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
     GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
@@ -47 +52 @@
       COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
     )
-  ENDIF(WIN32)
+  ENDIF(WIN32 AND HAVE_GLPK)
 ENDIF(HAVE_LP)
 
 IF(HAVE_MIP)
   ADD_EXECUTABLE(mip_test mip_test.cc)
-  TARGET_LINK_LIBRARIES(mip_test lemon ${GLPK_LIBRARIES})
+  IF(HAVE_GLPK)
+    TARGET_LINK_LIBRARIES(mip_test lemon ${GLPK_LIBRARIES})
+  ENDIF(HAVE_GLPK)
   ADD_TEST(mip_test mip_test)
 
-  IF(WIN32)
+  IF(WIN32 AND HAVE_GLPK)
     GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
     GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
@@ -63 +70 @@
       COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
     )
-  ENDIF(WIN32)
+  ENDIF(WIN32 AND HAVE_GLPK)
 ENDIF(HAVE_MIP)