[Lemon-commits] Alpar Juttner: Merge CPLEX 12.6 support to branc...

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/f28af6829e54
changeset: 1332:f28af6829e54
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Thu Apr 02 14:08:38 2015 +0200
description:
	Merge CPLEX 12.6 support to branch 1.3

diffstat:

 cmake/FindILOG.cmake |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (21 lines):

diff --git a/cmake/FindILOG.cmake b/cmake/FindILOG.cmake
--- a/cmake/FindILOG.cmake
+++ b/cmake/FindILOG.cmake
@@ -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
   )