Fix errors introduced when doing if(UNIX) in CMakeLists.txt

Fix declaration of variables not at beginning of scope (breaks C89) in tng compress testsuite.

3 files changed, 30 insertions, 21 deletions

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 42de927..303035e 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -12,8 +12,9 @@ configure_file(${TRAJECTORY_SOURCE_DIR}/include/tng_io_testing.h.in ${CMAKE_BINA
 include_directories(${CMAKE_BINARY_DIR}/generated/)
 
 add_executable(tng_testing tng_io_testing.c)
+target_link_libraries(tng_testing tng_io)
 if(UNIX)
-target_link_libraries(tng_testing tng_io m)
+target_link_libraries(tng_testing m)
 endif()
 
 if(HAVE_INTTYPES_H)
@@ -29,13 +30,15 @@ if(OPENMP_FOUND)
 endif()
 
 add_executable(tng_io_read_pos tng_io_read_pos.c)
+target_link_libraries(tng_io_read_pos tng_io)
 if(UNIX)
-target_link_libraries(tng_io_read_pos tng_io m)
+target_link_libraries(tng_io_read_pos m)
 endif()
 
 add_executable(tng_parallel_read tng_parallel_read.c)
+target_link_libraries(tng_parallel_read tng_io)
 if(UNIX)
-target_link_libraries(tng_parallel_read tng_io m)
+target_link_libraries(tng_parallel_read m)
 endif()
 
 if(BUILD_FORTRAN)
diff --git a/src/tests/compression/CMakeLists.txt b/src/tests/compression/CMakeLists.txt
index 33dfb61..930bcfc 100644
--- a/src/tests/compression/CMakeLists.txt
+++ b/src/tests/compression/CMakeLists.txt
@@ -16,8 +16,9 @@ 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)
 if(UNIX)
-target_link_libraries(test_tng_compress_gen${number} tng_compress m)
+target_link_libraries(test_tng_compress_gen${number} m)
 endif()
 list(APPEND gen${number}_build_definitions GEN)
 list(APPEND gen${number}_build_definitions TESTPARAM="test${number}.h")
@@ -25,8 +26,9 @@ set_target_properties(test_tng_compress_gen${number} PROPERTIES COMPILE_DEFINITI
 add_dependencies(test_tng_compress_gen${number} test${number}.h)
 
 add_executable(test_tng_compress_read${number} testsuite.c)
+target_link_libraries(test_tng_compress_read${number} tng_compress)
 if(UNIX)
-target_link_libraries(test_tng_compress_read${number} tng_compress m)
+target_link_libraries(test_tng_compress_read${number} m)
 endif()
 list(APPEND read${number}_build_definitions TESTPARAM="test${number}.h")
 set_target_properties(test_tng_compress_read${number} PROPERTIES COMPILE_DEFINITIONS "${read${number}_build_definitions}")
diff --git a/src/tests/compression/testsuite.c b/src/tests/compression/testsuite.c
index 3ed9f32..27450d6 100644
--- a/src/tests/compression/testsuite.c
+++ b/src/tests/compression/testsuite.c
@@ -782,28 +782,32 @@ static int algotest()
       write_tng_file(dumpfile,box1,velbox1);
 #else /* GEN */
 #ifdef INTTOFLOAT
-      unsigned long prec_hi, prec_lo;
-      unsigned long velprec_hi, velprec_lo;
-      readreturn=read_tng_file_int(dumpfile,intbox,intvelbox,&prec_hi,&prec_lo,&velprec_hi,&velprec_lo);
-      if (!readreturn)
-	{
-	  tng_compress_int_to_float(intbox,prec_hi,prec_lo,NATOMS,1,box2);
+      {
+	unsigned long prec_hi, prec_lo;
+	unsigned long velprec_hi, velprec_lo;
+	readreturn=read_tng_file_int(dumpfile,intbox,intvelbox,&prec_hi,&prec_lo,&velprec_hi,&velprec_lo);
+	if (!readreturn)
+	  {
+	    tng_compress_int_to_float(intbox,prec_hi,prec_lo,NATOMS,1,box2);
 #if WRITEVEL
-	  tng_compress_int_to_float(intvelbox,velprec_hi,velprec_lo,NATOMS,1,velbox2);
+	    tng_compress_int_to_float(intvelbox,velprec_hi,velprec_lo,NATOMS,1,velbox2);
 #endif
-	}
+	  }
+      }
 #else /* INTTOFLOAT */
 #ifdef INTTODOUBLE
-      unsigned long prec_hi, prec_lo;
-      unsigned long velprec_hi, velprec_lo;
-      readreturn=read_tng_file_int(dumpfile,intbox,intvelbox,&prec_hi,&prec_lo,&velprec_hi,&velprec_lo);
-      if (!readreturn)
-	{
-	  tng_compress_int_to_double(intbox,prec_hi,prec_lo,NATOMS,1,box2);
+      {
+	unsigned long prec_hi, prec_lo;
+	unsigned long velprec_hi, velprec_lo;
+	readreturn=read_tng_file_int(dumpfile,intbox,intvelbox,&prec_hi,&prec_lo,&velprec_hi,&velprec_lo);
+	if (!readreturn)
+	  {
+	    tng_compress_int_to_double(intbox,prec_hi,prec_lo,NATOMS,1,box2);
 #if WRITEVEL
-	  tng_compress_int_to_double(intvelbox,velprec_hi,velprec_lo,NATOMS,1,velbox2);
+	    tng_compress_int_to_double(intvelbox,velprec_hi,velprec_lo,NATOMS,1,velbox2);
 #endif
-	}
+	  }
+      }
 #else /* INTTODOUBLE */
       readreturn=read_tng_file(dumpfile,box2,velbox2);
 #endif /* INTTODOUBLE */