From 2f0b67947255f4d11186b94a4e4349dd465be21d Mon Sep 17 00:00:00 2001
From: Magnus Lundborg <lundborg.magnus@gmail.com>
Date: Tue, 22 Oct 2013 12:53:50 +0200
Subject: Changed path for generated header files.

Always generate header files (to avoid cppcheck errors).
Fixed cppcheck error py using ++ prefix instead of suffix.

diff --git a/src/lib/tng_io.c b/src/lib/tng_io.c
index d819fad..eb878e8 100644
--- a/src/lib/tng_io.c
+++ b/src/lib/tng_io.c
@@ -7348,7 +7348,7 @@ tng_function_status DECLSPECDLLEXPORT tng_chain_residue_w_id_add
             * residues of this chain */
             if(temp_residue != last_residue)
             {
-                temp_residue++;
+                ++temp_residue;
                 memmove(temp_residue + 1, temp_residue,
                         last_residue - temp_residue);
             }
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index b119372..4abc7d3 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -6,8 +6,10 @@ link_directories(${TNG_IO_BINARY_DIR}/src/lib)
 
 set(EXAMPLE_FILES_DIR ${CMAKE_BINARY_DIR}/example_files/ CACHE STRING "Directory where to find input test files and save output files.")
 
-configure_file(${TNG_IO_SOURCE_DIR}/include/tng_io_testing.h.in ${CMAKE_BINARY_DIR}/generated/tng_io_testing.h)
-include_directories(${CMAKE_BINARY_DIR}/generated/)
+# Generate these two header files - even if the testing suites are not built. Avoids cppcheck errors.
+configure_file(${TNG_IO_SOURCE_DIR}/include/tng_io_testing.h.in ${CMAKE_BINARY_DIR}/include/tng_io_testing.h)
+configure_file(${TNG_IO_SOURCE_DIR}/include/compression/tng_compress_testing.h.in ${CMAKE_BINARY_DIR}/include/tng_compress_testing.h)
+include_directories(${CMAKE_BINARY_DIR}/include/)
 
 if(TNG_BUILD_TEST)
     add_executable(tng_testing tng_io_testing.c)
diff --git a/src/tests/compression/CMakeLists.txt b/src/tests/compression/CMakeLists.txt
index 62eef26..9edf9de 100644
--- a/src/tests/compression/CMakeLists.txt
+++ b/src/tests/compression/CMakeLists.txt
@@ -3,10 +3,8 @@ link_directories(${TNG_IO_BINARY_DIR}/src/lib)
 set(TNG_COMPRESS_FILES_DIR ${CMAKE_BINARY_DIR}/test_tng_compress_files/ CACHE STRING "Directory where to write tng_compress test files.")
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/test_tng_compress_files)
-configure_file(${TNG_IO_SOURCE_DIR}/include/compression/tng_compress_testing.h.in ${CMAKE_BINARY_DIR}/generated/tng_compress_testing.h)
 
-include_directories(${CMAKE_SOURCE_DIR}/include/compression)
-include_directories(${CMAKE_BINARY_DIR}/generated/)
+include_directories(${CMAKE_BINARY_DIR}/include/)
 
 set(number 0)
 set(numtests 78)
-- 
cgit v0.10.1