From 2092b2c010a8e2bc419e94a8d9b48befc6847852 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sat, 3 Aug 2019 06:47:27 -0400 Subject: [PATCH 1/2] Step version string for stable release --- doc/lammps.1 | 2 +- doc/src/Manual.txt | 4 ++-- src/version.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/lammps.1 b/doc/lammps.1 index 6539b85af9..46f83698ec 100644 --- a/doc/lammps.1 +++ b/doc/lammps.1 @@ -1,4 +1,4 @@ -.TH LAMMPS "2 August 2019" "2019-08-02" +.TH LAMMPS "6 August 2019" "2019-08-06" .SH NAME .B LAMMPS \- Molecular Dynamics Simulator. diff --git a/doc/src/Manual.txt b/doc/src/Manual.txt index 85828f1d90..e461e585d9 100644 --- a/doc/src/Manual.txt +++ b/doc/src/Manual.txt @@ -1,7 +1,7 @@ LAMMPS Users Manual - + @@ -21,7 +21,7 @@ :line LAMMPS Documentation :c,h1 -2 Aug 2019 version :c,h2 +6 Aug 2019 version :c,h2 "What is a LAMMPS version?"_Manual_version.html diff --git a/src/version.h b/src/version.h index b74aa30172..2154f428c4 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define LAMMPS_VERSION "2 Aug 2019" +#define LAMMPS_VERSION "6 Aug 2019" From 3ef93d6e1b97384a5d11b8e1b31ec0114f089974 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Mon, 5 Aug 2019 16:59:18 -0400 Subject: [PATCH 2/2] cannot forced enable FFMpeg and gzip on windows yet. --- cmake/presets/mingw-cross.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmake/presets/mingw-cross.cmake b/cmake/presets/mingw-cross.cmake index fbec42529f..920b377e48 100644 --- a/cmake/presets/mingw-cross.cmake +++ b/cmake/presets/mingw-cross.cmake @@ -13,7 +13,5 @@ endforeach() set(DOWNLOAD_VORO ON CACHE BOOL "" FORCE) set(DOWNLOAD_EIGEN3 ON CACHE BOOL "" FORCE) -set(WITH_GZIP ON CACHE BOOL "" FORCE) -set(WITH_FFMPEG ON CACHE BOOL "" FORCE) set(LAMMPS_MEMALIGN "0" CACHE STRING "" FORCE) set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/lammps-installer")