# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1324685759 -3600
# Node ID 1818cc848005917d6bfd05655a2281a87e4c7dcd
# Parent  53c0dd3870013b9225857b51b13d4dc5c6b435ef
Update CPLEX lookup

 - References to explicit CPLEX version 9.1 have been removed
 - Library file name must either be 'cplex.a' or 'cplex.dll'

diff -r 53c0dd387001 -r 1818cc848005 cmake/FindCPLEX.cmake
--- a/cmake/FindCPLEX.cmake	Tue Dec 20 19:33:51 2011 +0100
+++ b/cmake/FindCPLEX.cmake	Sat Dec 24 01:15:59 2011 +0100
@@ -2,23 +2,25 @@
 
 FIND_PATH(CPLEX_INCLUDE_DIR
   ilcplex/cplex.h
-  PATHS "C:/ILOG/CPLEX91/include"
-  PATHS "/opt/ilog/cplex91/include"
+  PATHS "C:/ILOG/CPLEX/include"
+  PATHS "/opt/ilog/cplex/include"
   HINTS ${CPLEX_ROOT_DIR}/include
 )
 FIND_LIBRARY(CPLEX_LIBRARY
-  cplex91
-  PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda"
-  PATHS "/opt/ilog/cplex91/bin"
+  cplex
+  PATHS "C:/ILOG/CPLEX/lib/msvc7/stat_mda"
+  PATHS "/opt/ilog/cplex/bin"
   HINTS ${CPLEX_ROOT_DIR}/bin
+  HINTS ${CPLEX_ROOT_DIR}/lib
 )
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPLEX DEFAULT_MSG CPLEX_LIBRARY CPLEX_INCLUDE_DIR)
 
 FIND_PATH(CPLEX_BIN_DIR
-  cplex91.dll
-  PATHS "C:/ILOG/CPLEX91/bin/x86_win32"
+  cplex.dll
+  PATHS "C:/ILOG/CPLEX/bin/x86_win32"
+  HINTS ${CPLEX_ROOT_DIR}/bin
 )
 
 IF(CPLEX_FOUND)
diff -r 53c0dd387001 -r 1818cc848005 test/CMakeLists.txt
--- a/test/CMakeLists.txt	Tue Dec 20 19:33:51 2011 +0100
+++ b/test/CMakeLists.txt	Sat Dec 24 01:15:59 2011 +0100
@@ -82,7 +82,7 @@
     GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
     GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
     ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
+      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
     )
   ENDIF()
 ENDIF()
@@ -124,7 +124,7 @@
     GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
     GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
     ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
+      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
     )
   ENDIF()
 ENDIF()