1.1 --- a/lemon/CMakeLists.txt Tue Jan 20 12:23:14 2009 +0000
1.2 +++ b/lemon/CMakeLists.txt Wed Jan 21 18:08:31 2009 +0000
1.3 @@ -1,7 +1,6 @@
1.4 INCLUDE_DIRECTORIES(
1.5 ${CMAKE_SOURCE_DIR}
1.6 ${CMAKE_BINARY_DIR}
1.7 - ${GLPK_INCLUDE_DIR}
1.8 )
1.9
1.10 CONFIGURE_FILE(
1.11 @@ -19,6 +18,12 @@
1.12
1.13 IF(HAVE_GLPK)
1.14 SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
1.15 + INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})
1.16 + IF(WIN32)
1.17 + INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)
1.18 + INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)
1.19 + INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
1.20 + ENDIF(WIN32)
1.21 ENDIF(HAVE_GLPK)
1.22
1.23 ADD_LIBRARY(lemon ${LEMON_SOURCES})
1.24 @@ -33,9 +38,3 @@
1.25 DESTINATION include/lemon
1.26 COMPONENT headers
1.27 FILES_MATCHING PATTERN "*.h")
1.28 -
1.29 -IF(WIN32)
1.30 - INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)
1.31 - INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)
1.32 - INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
1.33 -ENDIF(WIN32)