Version 1.6 of the TNG library.

Added functions to get the version of the header and the
library.

Improved version control of the library using CMake config and
version files.

Changed tng_util_frame_current_compression_get() return type
to double before the API is widely circulated (no release
has been made since that function was added).

Compiling compression functions into the tng_io library.

Uses BuildTNG.cmake instead of including add_subdirectories.

Change-Id: I5e4818736fb2632c06ca7df8e84ce9544bf2acaf

8 files changed, 31 insertions, 21 deletions

diff --git a/src/tests/compression/CMakeLists.txt b/src/tests/compression/CMakeLists.txt
index 075b06b..d29791b 100644
--- a/src/tests/compression/CMakeLists.txt
+++ b/src/tests/compression/CMakeLists.txt
@@ -4,8 +4,6 @@ add_definitions(-DTNG_COMPRESS_FILES_DIR="${CMAKE_BINARY_DIR}/test_tng_compress_
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/test_tng_compress_files)
 
-include_directories(${CMAKE_BINARY_DIR}/include/)
-
 set(number 0)
 set(numtests 78)
 
@@ -14,7 +12,7 @@ while( number LESS ${numtests})
 math( EXPR number "${number} + 1" )
 
 add_executable(test_tng_compress_gen${number} testsuite.c)
-target_link_libraries(test_tng_compress_gen${number} tng_compress)
+target_link_libraries(test_tng_compress_gen${number} tng_io)
 if(UNIX)
 target_link_libraries(test_tng_compress_gen${number} m)
 endif()
@@ -25,7 +23,7 @@ add_dependencies(test_tng_compress_gen${number} test${number}.h)
 set_property(TARGET test_tng_compress_gen${number} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/compression_tests)
 
 add_executable(test_tng_compress_read${number} testsuite.c)
-target_link_libraries(test_tng_compress_read${number} tng_compress)
+target_link_libraries(test_tng_compress_read${number} tng_io)
 if(UNIX)
 target_link_libraries(test_tng_compress_read${number} m)
 endif()
diff --git a/src/tests/compression/testsuite.c b/src/tests/compression/testsuite.c
index 2cfe05e..e266c11 100644
--- a/src/tests/compression/testsuite.c
+++ b/src/tests/compression/testsuite.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "../../../include/compression/tng_compress.h"
+#include "compression/tng_compress.h"
 #include TESTPARAM
 
 #ifdef TEST_FLOAT
diff --git a/src/tests/md_openmp.c b/src/tests/md_openmp.c
index fd9f4b0..aac8b3b 100644
--- a/src/tests/md_openmp.c
+++ b/src/tests/md_openmp.c
@@ -1,11 +1,11 @@
 #ifdef TNG_BUILD_OPENMP_EXAMPLES
 
-# include <stdlib.h>
-# include <stdio.h>
-# include <time.h>
-# include <math.h>
-# include <omp.h>
-#include "../../include/tng_io.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <math.h>
+#include <omp.h>
+#include "tng/tng_io.h"
 
 int main ();
 void compute ( int np, int nd, double pos[], double vel[],
diff --git a/src/tests/md_openmp_util.c b/src/tests/md_openmp_util.c
index 8c332f3..9fe6c91 100644
--- a/src/tests/md_openmp_util.c
+++ b/src/tests/md_openmp_util.c
@@ -1,11 +1,11 @@
 #ifdef TNG_BUILD_OPENMP_EXAMPLES
 
-# include <stdlib.h>
-# include <stdio.h>
-# include <time.h>
-# include <math.h>
-# include <omp.h>
-#include "../../include/tng_io.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <math.h>
+#include <omp.h>
+#include "tng/tng_io.h"
 
 int main ();
 void compute ( int np, int nd, float pos[], float vel[],
diff --git a/src/tests/tng_io_read_pos.c b/src/tests/tng_io_read_pos.c
index 2a0bb09..b29cec7 100644
--- a/src/tests/tng_io_read_pos.c
+++ b/src/tests/tng_io_read_pos.c
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "../../include/tng_io.h"
+#include "tng/tng_io.h"
 
 int main(int argc, char **argv)
 {
diff --git a/src/tests/tng_io_read_pos_util.c b/src/tests/tng_io_read_pos_util.c
index 1667bae..b237dad 100644
--- a/src/tests/tng_io_read_pos_util.c
+++ b/src/tests/tng_io_read_pos_util.c
@@ -17,7 +17,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "../../include/tng_io.h"
+#include "tng/tng_io.h"
 
 int main(int argc, char **argv)
 {
diff --git a/src/tests/tng_io_testing.c b/src/tests/tng_io_testing.c
index dd13d92..e1e2726 100644
--- a/src/tests/tng_io_testing.c
+++ b/src/tests/tng_io_testing.c
@@ -15,7 +15,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "../../include/tng_io.h"
+#include "tng/tng_io.h"
+#include "tng/version.h"
 
 static tng_function_status tng_test_setup_molecules(tng_trajectory_t traj)
 {
@@ -595,6 +596,17 @@ int main()
     tng_trajectory_t traj;
     tng_function_status stat;
     char time_str[TNG_MAX_DATE_STR_LEN];
+    char version_str[TNG_MAX_STR_LEN];
+
+    tng_version(traj, version_str, TNG_MAX_STR_LEN);
+    if(strncmp(TNG_VERSION, version_str, TNG_MAX_STR_LEN) == 0)
+    {
+        printf("Test version control: \t\t\t\tSucceeded.\n");
+    }
+    else
+    {
+        printf("Test version control: \t\t\t\tFailed.\n");
+    }
 
     if(tng_trajectory_init(&traj) != TNG_SUCCESS)
     {
diff --git a/src/tests/tng_parallel_read.c b/src/tests/tng_parallel_read.c
index e2e23c6..44e8f79 100644
--- a/src/tests/tng_parallel_read.c
+++ b/src/tests/tng_parallel_read.c
@@ -13,7 +13,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "../../include/tng_io.h"
+#include "tng/tng_io.h"
 
 
 /* N.B. this code is for testing parallel reading of trajectory frame sets. The