diff options
| author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-10-22 10:53:50 (GMT) |
|---|---|---|
| committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-10-22 10:53:50 (GMT) |
| commit | 2f0b67947255f4d11186b94a4e4349dd465be21d (patch) | |
| tree | 5f8f6ae987394760103414a8ff0a64d18a9a9154 /src/tests | |
| parent | 60e51d78bc0832407e04c7fdc4d39e977daab2ed (diff) | |
Changed path for generated header files.
Always generate header files (to avoid cppcheck errors).
Fixed cppcheck error py using ++ prefix instead of suffix.
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/tests/compression/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 5 deletions
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) |