projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'prerelease-3.2.1'
[unres.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
2ee17e3
..
ce545e5
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-7,7
+7,7
@@
project(UNRESPACK Fortran C)
set(UNRES_MAJOR 3)
set(UNRES_MINOR 2)
set(UNRES_MAJOR 3)
set(UNRES_MINOR 2)
-set(UNRES_PATCH 1)
+set(UNRES_PATCH 2)
set(UNRES_VERSION ${UNRES_MAJOR}.${UNRES_MINOR}.${UNRES_PATCH})
#======================================
set(UNRES_VERSION ${UNRES_MAJOR}.${UNRES_MINOR}.${UNRES_PATCH})
#======================================
@@
-116,7
+116,7
@@
set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/bin" CACHE PATH "Binary install di
# Set force field
if (NOT UNRES_FF)
# Set force field
if (NOT UNRES_FF)
- set(UNRES_MD_FF "GAB" CACHE STRING "Choose the force field, options are: GAB E0LL2Y" )
+ set(UNRES_MD_FF "E0LL2Y" CACHE STRING "Choose the force field, options are: GAB E0LL2Y" )
set_property(CACHE UNRES_MD_FF PROPERTY STRINGS "GAB" "E0LL2Y")
endif (NOT UNRES_FF)
set_property(CACHE UNRES_MD_FF PROPERTY STRINGS "GAB" "E0LL2Y")
endif (NOT UNRES_FF)