Skip to content
Snippets Groups Projects
Commit 32c7a97a authored by Studer Gabriel's avatar Studer Gabriel
Browse files

Merge branch 'master' into develop

parents 2468813f f1cd2541
Branches
Tags
No related merge requests found
Changes in Release 2.x.c Changes in Release 2.3.1
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
* Simplify Dockerfile - remove MSMS * Simplify Dockerfile - remove MSMS
* Enable OpenMM 7.7.0
* Resolve segfault in DNG observed in Python 3.9
Changes in Release 2.3.0 Changes in Release 2.3.0
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
...@@ -15,7 +15,7 @@ project(OpenStructure CXX C) ...@@ -15,7 +15,7 @@ project(OpenStructure CXX C)
set (CMAKE_EXPORT_COMPILE_COMMANDS 1) set (CMAKE_EXPORT_COMPILE_COMMANDS 1)
set (OST_VERSION_MAJOR 2) set (OST_VERSION_MAJOR 2)
set (OST_VERSION_MINOR 3) set (OST_VERSION_MINOR 3)
set (OST_VERSION_PATCH 0) set (OST_VERSION_PATCH 1)
set (OST_VERSION_STRING ${OST_VERSION_MAJOR}.${OST_VERSION_MINOR}.${OST_VERSION_PATCH} ) set (OST_VERSION_STRING ${OST_VERSION_MAJOR}.${OST_VERSION_MINOR}.${OST_VERSION_PATCH} )
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake_support) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake_support)
include(OST) include(OST)
......
...@@ -2,7 +2,7 @@ FROM ubuntu:20.04 ...@@ -2,7 +2,7 @@ FROM ubuntu:20.04
# ARGUMENTS # ARGUMENTS
########### ###########
ARG OPENSTRUCTURE_VERSION="2.3.0" ARG OPENSTRUCTURE_VERSION="2.3.1"
ARG SRC_FOLDER="/usr/local/src" ARG SRC_FOLDER="/usr/local/src"
ARG CPUS_FOR_MAKE=2 ARG CPUS_FOR_MAKE=2
ARG OPENMM_VERSION="7.1.1" ARG OPENMM_VERSION="7.1.1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment