Changes in cmake/FindCPLEX.cmake [636:6dc44006c1a8:627:20dac2104519] in lemon-main

File:

• cmake/FindCPLEX.cmake (modified) (2 diffs)

cmake/FindCPLEX.cmake

@@ -1 @@
-SET(CPLEX_ROOT_DIR "" CACHE PATH "CPLEX root directory")
-
 FIND_PATH(CPLEX_INCLUDE_DIR
   ilcplex/cplex.h
-  PATHS "C:/ILOG/CPLEX91/include"
-  PATHS "/opt/ilog/cplex91/include"
-  HINTS ${CPLEX_ROOT_DIR}/include
-)
+  PATHS "C:/ILOG/CPLEX91/include")
+
 FIND_LIBRARY(CPLEX_LIBRARY
-  cplex91
-  PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda"
-  PATHS "/opt/ilog/cplex91/bin"
-  HINTS ${CPLEX_ROOT_DIR}/bin
-)
+  NAMES cplex91
+  PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda")
 
 INCLUDE(FindPackageHandleStandardArgs)
@@ -19 +12 @@
 FIND_PATH(CPLEX_BIN_DIR
   cplex91.dll
-  PATHS "C:/ILOG/CPLEX91/bin/x86_win32"
-)
+  PATHS "C:/ILOG/CPLEX91/bin/x86_win32")
 
 IF(CPLEX_FOUND)
   SET(CPLEX_INCLUDE_DIRS ${CPLEX_INCLUDE_DIR})
   SET(CPLEX_LIBRARIES ${CPLEX_LIBRARY})
-  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    SET(CPLEX_LIBRARIES "${CPLEX_LIBRARIES};m;pthread")
-  ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 ENDIF(CPLEX_FOUND)