fixes installation path for GRB

hlefebvr · Feb 7, 2024 · c9ab868 · c9ab868
1 parent c820fc7
commit c9ab868
Show file tree

Hide file tree

Showing 18 changed files with 157 additions and 40 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.22)
-project(idol VERSION 0.6.11)
+project(idol VERSION 0.7.0)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${idol_SOURCE_DIR}/cmake")

diff --git a/cmake/FindCPLEX.cmake b/cmake/FindCPLEX.cmake
@@ -1,13 +1,17 @@
+if (NOT DEFINED CPLEX_DIR)
+    set(CPLEX_DIR $ENV{CPLEX_HOME})
+endif()
+
 find_path(
         CPLEX_INCLUDE_DIRS
         NAMES cplex.h
-        HINTS /opt/ibm/ILOG/CPLEX_Studio2211/cplex/ ${CPLEX_DIR} $ENV{CPLEX_HOME}
+        HINTS /opt/ibm/ILOG/CPLEX_Studio2211/cplex/ ${CPLEX_DIR}
         PATH_SUFFIXES include/ilcplex)
 
 find_library(
         CPLEX_LIBRARY
         NAMES cplex
-        HINTS /opt/ibm/ILOG/CPLEX_Studio2211/cplex/ ${CPLEX_DIR} $ENV{CPLEX_HOME}
+        HINTS /opt/ibm/ILOG/CPLEX_Studio2211/cplex/ ${CPLEX_DIR}
         PATH_SUFFIXES /lib/x86-64_linux/static_pic/
 )
 

diff --git a/cmake/FindEIGEN.cmake b/cmake/FindEIGEN.cmake
@@ -1,3 +1,7 @@
+if (NOT DEFINED EIGEN_DIR)
+    set(EIGEN_DIR $ENV{EIGEN_HOME})
+endif()
+
 find_path(
         EIGEN_INCLUDE_DIRS
         NAMES Eigen/Core

diff --git a/cmake/FindGLPK.cmake b/cmake/FindGLPK.cmake
@@ -1,14 +1,17 @@
+if (NOT DEFINED GLPK_DIR)
+    set(GLPK_DIR $ENV{GLPK_HOME})
+endif()
 
 find_path(
         GLPK_INCLUDE_DIRS
         NAMES glpk.h
-        HINTS /usr/include/ ${GLPK_DIR} $ENV{GLPK_HOME}
+        HINTS /usr/include/ ${GLPK_DIR}
 )
 
 find_library(
         GLPK_LIBRARY
         NAMES glpk
-        HINTS /usr/lib/ ${GLPK_DIR} $ENV{GLPK_HOME}
+        HINTS /usr/lib/ ${GLPK_DIR}
 )
 
 include(FindPackageHandleStandardArgs)

diff --git a/cmake/FindGUROBI.cmake b/cmake/FindGUROBI.cmake
@@ -1,13 +1,17 @@
+if (NOT DEFINED GUROBI_DIR)
+    set(GUROBI_DIR $ENV{GUROBI_HOME})
+endif()
+
 find_path(
         GUROBI_INCLUDE_DIRS
         NAMES gurobi_c.h
-        HINTS ${GUROBI_DIR} $ENV{GUROBI_HOME}
+        HINTS ${GUROBI_DIR}
         PATH_SUFFIXES include)
 
 find_library(
         GUROBI_LIBRARY
         NAMES gurobi gurobi81 gurobi90 gurobi95 gurobi1000 gurobi100 gurobi110
-        HINTS ${GUROBI_DIR} $ENV{GUROBI_HOME}
+        HINTS ${GUROBI_DIR}
         PATH_SUFFIXES lib)
 
 if(MSVC)

diff --git a/cmake/FindMOSEK.cmake b/cmake/FindMOSEK.cmake
@@ -1,20 +1,25 @@
+if (NOT DEFINED MOSEK_DIR)
+    set(MOSEK_DIR $ENV{MOSEK_HOME})
+endif()
+
+
 find_path(
         MOSEK_INCLUDE_DIRS
         NAMES fusion.h
-        HINTS ${MOSEK_DIR} $ENV{MOSEK_HOME}
+        HINTS ${MOSEK_DIR}
         PATH_SUFFIXES h
 )
 
 find_library(
         MOSEK_LIBRARY
         NAMES mosek64 mosek
-        HINTS ${MOSEK_DIR} $ENV{MOSEK_HOME}
+        HINTS ${MOSEK_DIR}
         PATH_SUFFIXES bin)
 
 find_library(
         FUSION_LIBRARY
         NAMES fusion64 fusion
-        HINTS ${MOSEK_DIR} $ENV{MOSEK_HOME}
+        HINTS ${MOSEK_DIR}
         PATH_SUFFIXES bin)
 
 

diff --git a/cmake/coin-or/FindALPS.cmake b/cmake/coin-or/FindALPS.cmake
@@ -1,13 +1,17 @@
+if (NOT DEFINED COIN_OR_DIR)
+    set(COIN_OR_DIR $ENV{COIN_OR_HOME})
+endif()
+
 find_path(
         ALPS_INCLUDE_DIRS
         NAMES Alps.h
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES include/coin)
 
 find_library(
         ALPS_LIBRARY
         NAMES Alps
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES lib)
 
 include(FindPackageHandleStandardArgs)

diff --git a/cmake/coin-or/FindBCPS.cmake b/cmake/coin-or/FindBCPS.cmake
@@ -1,13 +1,17 @@
+if (NOT DEFINED COIN_OR_DIR)
+    set(COIN_OR_DIR $ENV{COIN_OR_HOME})
+endif()
+
 find_path(
         BCPS_INCLUDE_DIRS
         NAMES Bcps.h
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES include/coin)
 
 find_library(
         BCPS_LIBRARY
         NAMES Bcps
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES lib)
 
 include(FindPackageHandleStandardArgs)

diff --git a/cmake/coin-or/FindBLIS.cmake b/cmake/coin-or/FindBLIS.cmake
@@ -1,13 +1,17 @@
+if (NOT DEFINED COIN_OR_DIR)
+    set(COIN_OR_DIR $ENV{COIN_OR_HOME})
+endif()
+
 find_path(
         BLIS_INCLUDE_DIRS
         NAMES Blis.h
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES include/coin)
 
 find_library(
         BLIS_LIBRARY
         NAMES Blis
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES lib)
 
 include(FindPackageHandleStandardArgs)

diff --git a/cmake/coin-or/FindCBC.cmake b/cmake/coin-or/FindCBC.cmake
@@ -1,13 +1,17 @@
+if (NOT DEFINED COIN_OR_DIR)
+    set(COIN_OR_DIR $ENV{COIN_OR_HOME})
+endif()
+
 find_path(
         CBC_INCLUDE_DIRS
         NAMES CbcConfig.h
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES include/coin)
 
 find_library(
         CBC_LIBRARY
         NAMES Cbc
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES lib)
 
 include(FindPackageHandleStandardArgs)

diff --git a/cmake/coin-or/FindCGL.cmake b/cmake/coin-or/FindCGL.cmake
@@ -1,13 +1,17 @@
+if (NOT DEFINED COIN_OR_DIR)
+    set(COIN_OR_DIR $ENV{COIN_OR_HOME})
+endif()
+
 find_path(
         CGL_INCLUDE_DIRS
         NAMES CglConfig.h
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES include/coin)
 
 find_library(
         CGL_LIBRARY
         NAMES Cgl
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES lib)
 
 include(FindPackageHandleStandardArgs)

diff --git a/cmake/coin-or/FindCLP.cmake b/cmake/coin-or/FindCLP.cmake
@@ -1,19 +1,23 @@
+if (NOT DEFINED COIN_OR_DIR)
+    set(COIN_OR_DIR $ENV{COIN_OR_HOME})
+endif()
+
 find_path(
         CLP_INCLUDE_DIRS
         NAMES ClpConfig.h
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES include/coin)
 
 find_library(
         CLP_LIBRARY
         NAMES Clp
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES lib)
 
 find_library(
         CLP_SOLVER_LIBRARY
         NAMES ClpSolver
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES lib)
 
 include(FindPackageHandleStandardArgs)

diff --git a/cmake/coin-or/FindCOINUTILS.cmake b/cmake/coin-or/FindCOINUTILS.cmake
@@ -1,13 +1,17 @@
+if (NOT DEFINED COIN_OR_DIR)
+    set(COIN_OR_DIR $ENV{COIN_OR_HOME})
+endif()
+
 find_path(
         COINUTILS_INCLUDE_DIRS
         NAMES CoinModel.hpp
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES include/coin)
 
 find_library(
         COINUTILS_LIBRARY
         NAMES CoinUtils
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES lib)
 
 include(FindPackageHandleStandardArgs)

diff --git a/cmake/coin-or/FindMIBS.cmake b/cmake/coin-or/FindMIBS.cmake
@@ -1,20 +1,24 @@
+if (NOT DEFINED COIN_OR_DIR)
+    set(COIN_OR_DIR $ENV{COIN_OR_HOME})
+endif()
+
 find_path(
         MIBS_INCLUDE_DIRS
         NAMES MibSModel.hpp
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES include/coin)
 
 
 find_library(
         MIBS_LIBRARY
         NAMES Mibs
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES lib)
 
 find_library(
         MIBS_LIBRARY
         NAMES MibS
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES lib)
 
 include(FindPackageHandleStandardArgs)

diff --git a/cmake/coin-or/FindOSI.cmake b/cmake/coin-or/FindOSI.cmake
@@ -1,14 +1,18 @@
+if (NOT DEFINED COIN_OR_DIR)
+    set(COIN_OR_DIR $ENV{COIN_OR_HOME})
+endif()
+
 find_path(
         OSI_INCLUDE_DIRS
         NAMES OsiConfig.h
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES include/coin)
 
 if (${USE_CBC})
     find_library(
             OSI_CBC_LIBRARY
             NAMES OsiCbc
-            HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+            HINTS ${COIN_OR_DIR}
             PATH_SUFFIXES lib)
     list(APPEND REQUIRED_FILES "OSI_CBC_LIBRARY")
 endif()
@@ -17,7 +21,7 @@ if (${USE_CLP})
     find_library(
             OSI_CLP_LIBRARY
             NAMES OsiClp
-            HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+            HINTS ${COIN_OR_DIR}
             PATH_SUFFIXES lib)
     list(APPEND REQUIRED_FILES "OSI_CLP_LIBRARY")
 endif()
@@ -26,7 +30,7 @@ if (${USE_CPLEX})
     find_library(
             OSI_CPX_LIBRARY
             NAMES OsiCpx
-            HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+            HINTS ${COIN_OR_DIR}
             PATH_SUFFIXES lib)
     list(APPEND REQUIRED_FILES "OSI_CPX_LIBRARY")
 endif()
@@ -35,15 +39,15 @@ if (${USE_SYMPHONY})
     find_library(
             OSI_SYM_LIBRARY
             NAMES OsiSym
-            HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+            HINTS ${COIN_OR_DIR}
             PATH_SUFFIXES lib)
     list(APPEND REQUIRED_FILES "OSI_SYM_LIBRARY")
 endif()
 
 find_library(
         OSI_LIBRARY
         NAMES Osi
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES lib)
 
 include(FindPackageHandleStandardArgs)

diff --git a/cmake/coin-or/FindSYMPHONY.cmake b/cmake/coin-or/FindSYMPHONY.cmake
@@ -1,13 +1,17 @@
+if (NOT DEFINED COIN_OR_DIR)
+    set(COIN_OR_DIR $ENV{COIN_OR_HOME})
+endif()
+
 find_path(
         SYMPHONY_INCLUDE_DIRS
         NAMES symphony.h
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES include/coin)
 
 find_library(
         SYMPHONY_LIBRARY
         NAMES Sym
-        HINTS ${COIN_OR_DIR} $ENV{COIN_OR_HOME}
+        HINTS ${COIN_OR_DIR}
         PATH_SUFFIXES lib)
 
 include(FindPackageHandleStandardArgs)

diff --git a/docs/conf.py b/docs/conf.py
@@ -41,8 +41,8 @@
     'breathe',
     'sphinx.ext.mathjax',
     'sphinx_copybutton',
-    'sphinxmermaid',
-    'sphinxcontrib.bibtex'
+    'sphinxmermaid'#,
+    #'sphinxcontrib.bibtex'
 ]
 bibtex_bibfiles = ['bibliography.bib']
 bibtex_default_style = 'plain'