Merge branch 'main' into dev

hlefebvr · Dec 18, 2023 · 9f66d4c · 9f66d4c
2 parents 4b345ff + a14ed93
commit 9f66d4c
Show file tree

Hide file tree

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

diff --git a/cmake/FindGUROBI.cmake b/cmake/FindGUROBI.cmake
@@ -6,7 +6,7 @@ find_path(
 
 find_library(
         GUROBI_LIBRARY
-        NAMES gurobi gurobi81 gurobi90 gurobi95 gurobi1000 gurobi100
+        NAMES gurobi gurobi81 gurobi90 gurobi95 gurobi1000 gurobi100 gurobi110
         HINTS ${GUROBI_DIR} $ENV{GUROBI_HOME}
         PATH_SUFFIXES lib)
 

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'