1.1 --- a/lemon/CMakeLists.txt Mon Jul 16 16:21:40 2018 +0200
1.2 +++ b/lemon/CMakeLists.txt Wed Oct 17 19:14:07 2018 +0200
1.3 @@ -4,12 +4,12 @@
1.4 )
1.5
1.6 CONFIGURE_FILE(
1.7 - ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
1.8 + ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
1.9 ${CMAKE_CURRENT_BINARY_DIR}/config.h
1.10 )
1.11
1.12 CONFIGURE_FILE(
1.13 - ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.cmake
1.14 + ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.in
1.15 ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
1.16 @ONLY
1.17 )
1.18 @@ -36,7 +36,7 @@
1.19
1.20 IF(LEMON_HAVE_CPLEX)
1.21 SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc)
1.22 - INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS})
1.23 + INCLUDE_DIRECTORIES(${ILOG_INCLUDE_DIRS})
1.24 ENDIF()
1.25
1.26 IF(LEMON_HAVE_CLP)
1.27 @@ -49,9 +49,19 @@
1.28 INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
1.29 ENDIF()
1.30
1.31 +IF(LEMON_HAVE_SOPLEX)
1.32 + SET(LEMON_SOURCES ${LEMON_SOURCES} soplex.cc)
1.33 + INCLUDE_DIRECTORIES(${SOPLEX_INCLUDE_DIRS})
1.34 +ENDIF()
1.35 +
1.36 ADD_LIBRARY(lemon ${LEMON_SOURCES})
1.37 +
1.38 +TARGET_LINK_LIBRARIES(lemon
1.39 + ${GLPK_LIBRARIES} ${COIN_LIBRARIES} ${ILOG_LIBRARIES} ${SOPLEX_LIBRARIES}
1.40 + )
1.41 +
1.42 IF(UNIX)
1.43 - SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon)
1.44 + SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon VERSION ${LEMON_VERSION} SOVERSION ${LEMON_VERSION})
1.45 ENDIF()
1.46
1.47 INSTALL(