# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1427976518 -7200
# Node ID f28af6829e54644bf7180af60dde56dfa5338052
# Parent  6516d9833517c413f89c4c5ffe6ea2e3e554f9d3# Parent  043a787c3ceed658694f3ef5a446f0a91d36db6e
Merge CPLEX 12.6 support to branch 1.3

diff -r 6516d9833517 -r f28af6829e54 cmake/FindILOG.cmake
--- a/cmake/FindILOG.cmake	Thu Apr 02 13:39:35 2015 +0200
+++ b/cmake/FindILOG.cmake	Thu Apr 02 14:08: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
   )