Merge branch 'master' of github.com:gnina/libmolgrid

gnina · Sep 2, 2021 · 64e4134 · 64e4134
2 parents 9449bcd + bbb0723
commit 64e4134
Show file tree

Hide file tree

Showing 138 changed files with 37,534 additions and 2,658 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,8 @@ vendor/
 # Ignore editors
 .vscode
 /.pytest_cache/
+.cproject
+.idea
+.project
+.pydevproject
+.settings
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(LibMolGrid LANGUAGES C CXX CUDA)
 
 #version number
 set (VERSION_MAJOR 0)
-set (VERSION_MINOR 1)
+set (VERSION_MINOR 5)
 set (VERSION_PATCH 0)
 
 #set default build type

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -55,7 +55,7 @@ IF(BUILD_DOCS)
 		                   COMMAND 
 		                     ${SPHINX_EXECUTABLE} -b html
 		                     # Tell Breathe where to find the Doxygen output
-		                     -Dbreathe_projects.ligmolgrid=${DOXYGEN_OUTPUT_DIR}
+		                     -Dbreathe_projects.libmolgrid=${DOXYGEN_OUTPUT_DIR}
                          ${SPHINX_CPP_SOURCE} ${SPHINX_CPP_BUILD}
 		                   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/docs/cpp
 		                   DEPENDS

diff --git a/docs/Gemfile b/docs/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 gem "minima", "~> 2.5"
-gem "github-pages", "201", group: :jekyll_plugins
+gem "github-pages", ">201", group: :jekyll_plugins
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.11"
 end