Mercuriallemon-1.3 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Merge CPLEX 12.6 support to branch 1.3 1.3
authorAlpar Juttner <alpar@cs.elte.hu>
Thu, 02 Apr 2015 14:08:38 +0200
branch1.3
changeset 1142f28af6829e54
parent 1140 6516d9833517
parent 1141 043a787c3cee
child 1145 5c247b4dc708
Merge CPLEX 12.6 support to branch 1.3 
     1.1 --- a/cmake/FindILOG.cmake	Thu Apr 02 13:39:35 2015 +0200
     1.2 +++ b/cmake/FindILOG.cmake	Thu Apr 02 14:08:38 2015 +0200
     1.3 @@ -62,6 +62,8 @@
     1.4    ${ILOG_CPLEX_ROOT_DIR}/lib/x86-64_sles10_4.1/static_pic
     1.5    ${ILOG_CPLEX_ROOT_DIR}/lib/x86_debian4.0_4.1/static_pic
     1.6    ${ILOG_CPLEX_ROOT_DIR}/lib/x86-64_debian4.0_4.1/static_pic
     1.7 +  ${ILOG_CPLEX_ROOT_DIR}/lib/x86_linux/static_pic
     1.8 +  ${ILOG_CPLEX_ROOT_DIR}/lib/x86-64_linux/static_pic
     1.9    ${ILOG_CPLEX_ROOT_DIR}/lib/${ILOG_WIN_COMPILER}/stat_mda
    1.10    NO_DEFAULT_PATH
    1.11    )
    1.12 @@ -72,6 +74,8 @@
    1.13    ${ILOG_CONCERT_ROOT_DIR}/lib/x86-64_sles10_4.1/static_pic
    1.14    ${ILOG_CONCERT_ROOT_DIR}/lib/x86_debian4.0_4.1/static_pic
    1.15    ${ILOG_CONCERT_ROOT_DIR}/lib/x86-64_debian4.0_4.1/static_pic
    1.16 +  ${ILOG_CONCERT_ROOT_DIR}/lib/x86_linux/static_pic
    1.17 +  ${ILOG_CONCERT_ROOT_DIR}/lib/x86-64_linux/static_pic
    1.18    ${ILOG_CONCERT_ROOT_DIR}/lib/${ILOG_WIN_COMPILER}/stat_mda
    1.19    NO_DEFAULT_PATH
    1.20    )
lemon-1.3