* update CMakeLists.txt, README and LeMonADEViewerMain

for LeMonADE v2.2.2

CMakeLists.txt

@@ -3,7 +3,7 @@
 #   o\.|./o    e   xtensible     | LeMonADE: An Open Source Implementation of the
 #  o\.\|/./o   Mon te-Carlo      |           Bond-Fluctuation-Model for Polymers
 # oo---0---oo  A   lgorithm and  |
-#  o/./|\.\o   D   evelopment    | Copyright (C) 2013-2015 by
+#  o/./|\.\o   D   evelopment    | Copyright (C) 2013-2021 by
 #   o/.|.\o    E   nvironment    | LeMonADE-Viewer Principal Developers (see AUTHORS)
 #     ooo                        |
 # ---------------------------------------------------------------------------------
@@ -27,29 +27,30 @@
 #
 # Project Properties
 #
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2)
+CMAKE_MINIMUM_REQUIRED (VERSION 3.10.0)
 PROJECT (LeMonADE-Viewer)
 SET (APPLICATION_NAME "LeMonADE-Viewer")
 SET (APPLICATION_CODENAME "${PROJECT_NAME}")
-SET (APPLICATION_COPYRIGHT_YEARS "2015")
+SET (APPLICATION_COPYRIGHT_YEARS "2015-2021")
 SET (APPLICATION_VERSION_MAJOR 1)
 SET (APPLICATION_VERSION_MINOR 3)
-SET (APPLICATION_VERSION_PATCH 0)
+SET (APPLICATION_VERSION_PATCH 1)
 SET (APPLICATION_VERSION_TYPE SNAPSHOT)
 SET (APPLICATION_VERSION_STRING "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}-${APPLICATION_VERSION_TYPE}")
 SET (APPLICATION_ID "${APPLICATION_VENDOR_ID}.${PROJECT_NAME}")
 
 
-SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC -O3")
+SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC -O3 -std=c++11 -fexpensive-optimizations -Wno-error=narrowing")
 
 #
 # Debugging Options
 #
 SET (CMAKE_VERBOSE_MAKEFILE 0) # Use 1 for debugging, 0 for release
-
+SET (CMAKE_BUILD_TYPE "Release") #default build type is Release
 #
 # Check if LEMONADE_DIR is given
 #
+if( NOT LEMONADE_DIR )
 set( LEMONADE_SUBMODULE_FOLDER "./extern/LeMonADE" )
 option( PULL_LEMONADE "If enabled LeMonADE will be downloaded and compiled in the folder ${LEMONADE_SUBMODULE_FOLDER}" ON )
 find_path( LEMONADE_INCLUDE_DIR
@@ -89,6 +90,10 @@ find_path( LEMONADE_LIBRARY_DIR
         lib
     DOC "LeMonADE library location"
 )
+else()
+    set( LEMONADE_INCLUDE_DIR "${LEMONADE_DIR}/include" )
+    set( LEMONADE_LIBRARY_DIR "${LEMONADE_DIR}/lib" )
+endif()
 if( NOT LEMONADE_INCLUDE_DIR )
     message( "LEMONADE_INCLUDE_DIR is not provided. If build fails, use -DLEMONADE_INCLUDE_DIR=/path/to/LeMonADE/headers/ or install to default location" )
 endif()

ChangeLog

@@ -17,3 +17,8 @@
 * Release-1.2.3
 - code refactoring for LeMonADE v2.0.0
 
+* Release-1.3.1
+- code refactoring for LeMonADE v2.2.2
+- CMakeList.txt improvements
+- update README.md
+

README.md

@@ -23,7 +23,15 @@ For further details of LeMonADE-project see: [LeMonADE-project]
 * Install cmake (minimum version 2.6.2)
 * Install FLTK and OpenGL (devel)
 * Install POV-Ray for high resolution rendering 
-* Just do for standard compilation (program):
+* Just do for standard compilation (program) incl. download of [LeMonADE v2.2.2](https://github.com/LeMonADE-project/LeMonADE/commit/7523a6b102b5b5d6162c5ba94c618ec16168c4b3):
+
+````sh
+    # generates the application in build-directory
+    ./configure
+    make
+````
+
+* Or providing another LeMonADE library for compilation:
 
 ````sh
     # generates the application in build-directory

include/LeMonADE-Viewer/LeMonADEViewerAboutWin.h

@@ -7,7 +7,7 @@
 |  oo---0---oo  | D   evelopment    | See: https://github.com/LeMonADE-project/LeMonADE
 |\  o/./|\.\o  /| E   nvironment    |
 | \  o/.|.\o  / | -                 |
-|  \   ooo   /  | Viewer            | Copyright (C) 2013-2015 by
+|  \   ooo   /  | Viewer            | Copyright (C) 2013-2015,2021 by
 |___\_______/___|                   | LeMonADE-Viewer Principal Developers (see AUTHORS)
 ----------------------------------------------------------------------------------
 
@@ -92,7 +92,7 @@ const std::string LeMonADEViewerAboutWin::getText() const
 
 	std::string msg=
 
-			"This is the application LeMonADE-Viewer V1.3.0.\n"
+			"This is the application LeMonADE-Viewer V1.3.1.\n"
 			"==============================================="
 			"\n"
 			"The abbreviation \"LeMonADE\" stands for \n"

src/LeMonADE-Viewer/CMakeLists.txt

@@ -1,5 +1,6 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.10)
 
 add_executable( ${APPLICATION_NAME} LeMonADEViewerMain.cpp Camera.cpp LineParser.cpp )
 target_link_libraries( ${APPLICATION_NAME} ${OPENGL_LIBRARIES} ${FLTK_LIBRARIES} LeMonADE )
+target_compile_options(${APPLICATION_NAME} PRIVATE -Wno-error=narrowing)
 SET_TARGET_PROPERTIES( ${APPLICATION_NAME} PROPERTIES VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}" OUTPUT_NAME ${APPLICATION_NAME} CLEAN_DIRECT_OUTPUT 1 )

src/LeMonADE-Viewer/LeMonADEViewerMain.cpp

@@ -36,7 +36,7 @@ along with LeMonADE-Viewer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <LeMonADE/core/ConfigureSystem.h>
 #include <LeMonADE/core/Ingredients.h>
-#include <LeMonADE/feature/FeatureMoleculesIO.h>
+#include <LeMonADE/feature/FeatureMoleculesIOUnsaveCheck.h>
 #include <LeMonADE/feature/FeatureAttributes.h>
 #include <LeMonADE/utility/RandomNumberGenerators.h>
 
@@ -188,7 +188,7 @@ int main( int argc, char * argv[] )
         //just as in the previous examples, we quickly define the features and basic
         //monomer type and create an instance of the thus defined system.
 
-        typedef LOKI_TYPELIST_3(FeatureMoleculesIO,FeatureVisualize,FeatureAttributes) Features;
+        typedef LOKI_TYPELIST_3(FeatureMoleculesIOUnsaveCheck,FeatureVisualize,FeatureAttributes<>) Features;
 
         // in most cases the number of connections of a monomer dosn't exceed 8 bonds
         const uint max_bonds=20;