# HG changeset patch # User Alpar Juttner # Date 1427976458 -7200 # Node ID 043a787c3ceed658694f3ef5a446f0a91d36db6e # Parent d51126dc39fa518a6a872da52f1ab92b16f44459 Support for CPLEX 12.6 diff -r d51126dc39fa -r 043a787c3cee cmake/FindILOG.cmake --- a/cmake/FindILOG.cmake Thu Apr 02 13:36:16 2015 +0200 +++ b/cmake/FindILOG.cmake Thu Apr 02 14:07:38 2015 +0200 @@ -62,6 +62,8 @@ ${ILOG_CPLEX_ROOT_DIR}/lib/x86-64_sles10_4.1/static_pic ${ILOG_CPLEX_ROOT_DIR}/lib/x86_debian4.0_4.1/static_pic ${ILOG_CPLEX_ROOT_DIR}/lib/x86-64_debian4.0_4.1/static_pic + ${ILOG_CPLEX_ROOT_DIR}/lib/x86_linux/static_pic + ${ILOG_CPLEX_ROOT_DIR}/lib/x86-64_linux/static_pic ${ILOG_CPLEX_ROOT_DIR}/lib/${ILOG_WIN_COMPILER}/stat_mda NO_DEFAULT_PATH ) @@ -72,6 +74,8 @@ ${ILOG_CONCERT_ROOT_DIR}/lib/x86-64_sles10_4.1/static_pic ${ILOG_CONCERT_ROOT_DIR}/lib/x86_debian4.0_4.1/static_pic ${ILOG_CONCERT_ROOT_DIR}/lib/x86-64_debian4.0_4.1/static_pic + ${ILOG_CONCERT_ROOT_DIR}/lib/x86_linux/static_pic + ${ILOG_CONCERT_ROOT_DIR}/lib/x86-64_linux/static_pic ${ILOG_CONCERT_ROOT_DIR}/lib/${ILOG_WIN_COMPILER}/stat_mda NO_DEFAULT_PATH )