diff -r 17d918051964 -r f59df77f5c8d lemon/CMakeLists.txt --- a/lemon/CMakeLists.txt Tue Jan 20 12:23:14 2009 +0000 +++ b/lemon/CMakeLists.txt Wed Jan 21 18:08:31 2009 +0000 @@ -1,7 +1,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} - ${GLPK_INCLUDE_DIR} ) CONFIGURE_FILE( @@ -19,6 +18,12 @@ 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) ADD_LIBRARY(lemon ${LEMON_SOURCES}) @@ -33,9 +38,3 @@ DESTINATION include/lemon 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)