+ added dependecies

+ added oxygen docs building
+ added versioning
* some optimization
This commit is contained in:
arcan1s
2014-01-26 06:17:14 +04:00
parent b7b627fba5
commit 38eb392e32
41 changed files with 2459 additions and 270 deletions

View File

@ -1,7 +1,5 @@
radf - program that calculates radial distribution function (RDF) or radial-angles
distribution function (RADF)
Version : 1.1.1
License : GPL
Usage:
radf -i INPUT -s FIRST,LAST -c X,Y,Z -at ... -o OUTPUT [ -r MIN,MAX ] [ -rs R_STEP ]

View File

@ -3,26 +3,8 @@ set (SUBPROJECT_BINARY_DIR bin)
set (SUBPROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
# include_path
include_directories (${SUBPROJECT_SOURCE_DIR})
include_directories (${SUBPROJECT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../)
# executable path
set (EXECUTABLE_OUTPUT_PATH ${SUBPROJECT_BINARY_DIR})
# verbose
set (CMAKE_VERBOSE_MAKEFILE ON)
# flags
if ( WITH_DEBUG_MODE )
add_definitions ( -DDEBUG_MODE=1 )
endif ()
if ( CMAKE_COMPILER_IS_GNUCXX )
set (ADD_CXX_FLAGS "-Wall")
set (CMAKE_CXX_FLAGS "-O0 ${ADD_CXX_FLAGS}")
set (CMAKE_CXX_FLAGS_DEBUG "-g -O0")
set (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
elseif ( MSVC )
set (ADD_CXX_FLAGS "/W4")
set (CMAKE_CXX_FLAGS "${ADD_CXX_FLAGS}")
else ()
message ("Unknown compiler")
endif ()

View File

@ -15,6 +15,7 @@ message (STATUS "${SUBPROJECT} HEADERS: ${HEADERS}")
# link libraries and compile
add_executable (${MM_PREFIX}${SUBPROJECT} ${SOURCES} ${HEADERS})
add_dependencies (${MM_PREFIX}${SUBPROJECT} ${LIBRARIES})
target_link_libraries (${MM_PREFIX}${SUBPROJECT} ${ADDITIONAL_LIB} ${LIBRARIES})
# install properties

View File

@ -4,6 +4,7 @@
#include <stdio.h>
#include <version.h>
#include <mathmech/messages.h>
@ -127,7 +128,7 @@ int printing_head (const char *output, const int log, const int quiet, const int
FILE *f_out;
f_out = fopen (output, "w");
fprintf (f_out, "radf ::: V.1.2.0\n\n");
fprintf (f_out, "radf ::: V.%s\n\n", PROJ_VERSION);
fprintf (f_out, "CONFIGURATION\n");
fprintf (f_out, "LOG=%i\nQUIET=%i\nMATRIX=%i\n", log, quiet, matrix);

View File

@ -8,6 +8,7 @@
#include <string.h>
#include "add_main.h"
#include <version.h>
#include <mathmech/coords.h>
#include <mathmech/messages.h>
#include <mathmech/radf.h>
@ -75,7 +76,7 @@ int main(int argc, char *argv[])
sprintf (tmp_str, " mm_radf\n");
sprintf (tmp_str, "%sProgram that calculates radial distribution function (RDF) or radial-angles\n", tmp_str);
sprintf (tmp_str, "%sdistribution function\n", tmp_str);
sprintf (tmp_str, "%sVersion : 1.2.0 License : GPL\n", tmp_str);
sprintf (tmp_str, "%sVersion : %s License : GPL\n", tmp_str, PROJ_VERSION);
sprintf (tmp_str, "%s Evgeniy Alekseev aka arcanis\n", tmp_str);
sprintf (tmp_str, "%s E-mail : esalexeev@gmail.com\n\n", tmp_str);
sprintf (tmp_str, "%sUsage:\n", tmp_str);