normalizing eof for everything
diff --git a/scripts/common.cmake b/scripts/common.cmake
index 0bd9c47..b7fd72c 100644
--- a/scripts/common.cmake
+++ b/scripts/common.cmake
@@ -1,144 +1,144 @@
-if(common_included)
- return()
-endif()
-set(common_included true)
-
-include(CMakeParseArguments)
-
-# cache this for use inside of the function
-set(CURRENT_LIST_DIR_CACHED ${CMAKE_CURRENT_LIST_DIR})
-
-enable_testing()
-
-set(TEST_MODE "COMPARE" CACHE STRING "Test mode - normal/run through valgrind/collect output/compare with output")
-set_property(CACHE TEST_MODE PROPERTY STRINGS "NORMAL;VALGRIND;COLLECT;COMPARE")
-
-# add a customized overloaded version of add_test() to suite my needs
-function(add_test)
- cmake_parse_arguments(ARG "NO_VALGRIND;NO_OUTPUT" "NAME" "COMMAND" ${ARGN})
- if(NOT "${ARG_UNPARSED_ARGUMENTS}" STREQUAL "" OR "${ARG_NAME}" STREQUAL "" OR "${ARG_COMMAND}" STREQUAL "")
- message(FATAL_ERROR "add_test() called with wrong options!")
- endif()
-
- set(the_test_mode NORMAL)
-
- # construct the command that will be called by the exec_test.cmake script
- set(the_command "")
- if(${TEST_MODE} STREQUAL "VALGRIND" AND NOT ARG_NO_VALGRIND)
- set(the_test_mode VALGRIND)
- set(the_command "valgrind -v --leak-check=full --track-origins=yes --error-exitcode=1")
- endif()
- foreach(cur ${ARG_COMMAND})
- set(the_command "${the_command} ${cur}")
- endforeach()
- # append the argument for removing paths from filenames in the output so tests give the same output everywhere
- set(the_command "${the_command} --dt-no-path-filenames=1")
- set(the_command "${the_command} --dt-no-exitcode=1")
-
- string(STRIP ${the_command} the_command)
-
- if(${TEST_MODE} STREQUAL "COLLECT" OR ${TEST_MODE} STREQUAL "COMPARE")
- if(NOT ARG_NO_OUTPUT)
- file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test_output/)
- set(the_test_mode ${TEST_MODE})
- list(APPEND ADDITIONAL_FLAGS -DTEST_OUTPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/test_output/${ARG_NAME}.txt)
- list(APPEND ADDITIONAL_FLAGS -DTEST_TEMP_FILE=${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/temp_test_output.txt)
- endif()
- endif()
-
- list(APPEND ADDITIONAL_FLAGS -DTEST_MODE=${the_test_mode})
-
- _add_test(NAME ${ARG_NAME} COMMAND ${CMAKE_COMMAND} -DCOMMAND=${the_command} ${ADDITIONAL_FLAGS} -P ${CURRENT_LIST_DIR_CACHED}/exec_test.cmake)
-endfunction()
-
-macro(add_compiler_flags)
- foreach(flag ${ARGV})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
- endforeach()
-endmacro()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
- add_compiler_flags(-Werror)
- add_compiler_flags(-std=c++98)
- add_compiler_flags(-pedantic)
- add_compiler_flags(-pedantic-errors)
- add_compiler_flags(-fvisibility=hidden)
- add_compiler_flags(-fstrict-aliasing)
-endif()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
- add_compiler_flags(-ansi)
- add_compiler_flags(-Wall)
- add_compiler_flags(-Wextra)
- add_compiler_flags(-fstack-protector-all)
- add_compiler_flags(-funsafe-loop-optimizations)
- add_compiler_flags(-fdiagnostics-show-option)
- add_compiler_flags(-Wconversion)
- add_compiler_flags(-Wno-missing-field-initializers)
- add_compiler_flags(-Wold-style-cast)
- add_compiler_flags(-Wfloat-equal)
- add_compiler_flags(-Wlogical-op)
- add_compiler_flags(-Wundef)
- add_compiler_flags(-Wredundant-decls)
- add_compiler_flags(-Wshadow)
- add_compiler_flags(-Wstrict-overflow=5)
- add_compiler_flags(-Wwrite-strings)
- add_compiler_flags(-Wpointer-arith)
- add_compiler_flags(-Wcast-qual)
- add_compiler_flags(-Wformat=2)
- add_compiler_flags(-Wswitch-default)
- add_compiler_flags(-Wmissing-include-dirs)
- add_compiler_flags(-Wcast-align)
- add_compiler_flags(-Wformat-nonliteral)
- add_compiler_flags(-Wparentheses)
- add_compiler_flags(-Winit-self)
- add_compiler_flags(-Wuninitialized)
- add_compiler_flags(-Wswitch-enum)
- add_compiler_flags(-Wno-endif-labels)
- add_compiler_flags(-Wunused-function)
- add_compiler_flags(-Wnon-virtual-dtor)
- add_compiler_flags(-Wno-pmf-conversions)
- add_compiler_flags(-Wctor-dtor-privacy)
- add_compiler_flags(-Wsign-promo)
- add_compiler_flags(-Wsign-conversion)
- add_compiler_flags(-Wdisabled-optimization)
- add_compiler_flags(-Weffc++)
- add_compiler_flags(-Winline)
- add_compiler_flags(-Winvalid-pch)
- add_compiler_flags(-Wstack-protector)
- add_compiler_flags(-Wunsafe-loop-optimizations)
- add_compiler_flags(-Wmissing-declarations)
- add_compiler_flags(-Woverloaded-virtual)
- add_compiler_flags(-Wstrict-null-sentinel)
- if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
- add_compiler_flags(-Wnoexcept)
- endif()
- #add_compiler_flags(-Waggregate-return) # GCC 4.8 does not silence this even with "#pragma GCC diagnostic ignored"
-
- if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
- add_compiler_flags(-Wdouble-promotion)
- add_compiler_flags(-Wtrampolines)
- add_compiler_flags(-Wzero-as-null-pointer-constant)
- add_compiler_flags(-Wuseless-cast)
- add_compiler_flags(-Wvector-operation-performance)
- add_compiler_flags(-Wsized-deallocation)
- endif()
-
- if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.3)
- add_compiler_flags(-Wshift-overflow=2)
- add_compiler_flags(-Wnull-dereference)
- add_compiler_flags(-Wduplicated-cond)
- add_compiler_flags(-Wmisleading-indentation)
- add_compiler_flags(-Wshift-negative-value)
- endif()
-endif()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- add_compiler_flags(-Weverything)
- add_compiler_flags(-Qunused-arguments -fcolor-diagnostics) # needed for ccache integration on travis
-endif()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
- add_compiler_flags(/WX)
- add_compiler_flags(/W4) # /Wall is too aggressive - even the standard C headers give thousands of errors...
-endif()
+if(common_included)
+ return()
+endif()
+set(common_included true)
+
+include(CMakeParseArguments)
+
+# cache this for use inside of the function
+set(CURRENT_LIST_DIR_CACHED ${CMAKE_CURRENT_LIST_DIR})
+
+enable_testing()
+
+set(TEST_MODE "COMPARE" CACHE STRING "Test mode - normal/run through valgrind/collect output/compare with output")
+set_property(CACHE TEST_MODE PROPERTY STRINGS "NORMAL;VALGRIND;COLLECT;COMPARE")
+
+# add a customized overloaded version of add_test() to suite my needs
+function(add_test)
+ cmake_parse_arguments(ARG "NO_VALGRIND;NO_OUTPUT" "NAME" "COMMAND" ${ARGN})
+ if(NOT "${ARG_UNPARSED_ARGUMENTS}" STREQUAL "" OR "${ARG_NAME}" STREQUAL "" OR "${ARG_COMMAND}" STREQUAL "")
+ message(FATAL_ERROR "add_test() called with wrong options!")
+ endif()
+
+ set(the_test_mode NORMAL)
+
+ # construct the command that will be called by the exec_test.cmake script
+ set(the_command "")
+ if(${TEST_MODE} STREQUAL "VALGRIND" AND NOT ARG_NO_VALGRIND)
+ set(the_test_mode VALGRIND)
+ set(the_command "valgrind -v --leak-check=full --track-origins=yes --error-exitcode=1")
+ endif()
+ foreach(cur ${ARG_COMMAND})
+ set(the_command "${the_command} ${cur}")
+ endforeach()
+ # append the argument for removing paths from filenames in the output so tests give the same output everywhere
+ set(the_command "${the_command} --dt-no-path-filenames=1")
+ set(the_command "${the_command} --dt-no-exitcode=1")
+
+ string(STRIP ${the_command} the_command)
+
+ if(${TEST_MODE} STREQUAL "COLLECT" OR ${TEST_MODE} STREQUAL "COMPARE")
+ if(NOT ARG_NO_OUTPUT)
+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test_output/)
+ set(the_test_mode ${TEST_MODE})
+ list(APPEND ADDITIONAL_FLAGS -DTEST_OUTPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/test_output/${ARG_NAME}.txt)
+ list(APPEND ADDITIONAL_FLAGS -DTEST_TEMP_FILE=${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/temp_test_output.txt)
+ endif()
+ endif()
+
+ list(APPEND ADDITIONAL_FLAGS -DTEST_MODE=${the_test_mode})
+
+ _add_test(NAME ${ARG_NAME} COMMAND ${CMAKE_COMMAND} -DCOMMAND=${the_command} ${ADDITIONAL_FLAGS} -P ${CURRENT_LIST_DIR_CACHED}/exec_test.cmake)
+endfunction()
+
+macro(add_compiler_flags)
+ foreach(flag ${ARGV})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ endforeach()
+endmacro()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+ add_compiler_flags(-Werror)
+ add_compiler_flags(-std=c++98)
+ add_compiler_flags(-pedantic)
+ add_compiler_flags(-pedantic-errors)
+ add_compiler_flags(-fvisibility=hidden)
+ add_compiler_flags(-fstrict-aliasing)
+endif()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ add_compiler_flags(-ansi)
+ add_compiler_flags(-Wall)
+ add_compiler_flags(-Wextra)
+ add_compiler_flags(-fstack-protector-all)
+ add_compiler_flags(-funsafe-loop-optimizations)
+ add_compiler_flags(-fdiagnostics-show-option)
+ add_compiler_flags(-Wconversion)
+ add_compiler_flags(-Wno-missing-field-initializers)
+ add_compiler_flags(-Wold-style-cast)
+ add_compiler_flags(-Wfloat-equal)
+ add_compiler_flags(-Wlogical-op)
+ add_compiler_flags(-Wundef)
+ add_compiler_flags(-Wredundant-decls)
+ add_compiler_flags(-Wshadow)
+ add_compiler_flags(-Wstrict-overflow=5)
+ add_compiler_flags(-Wwrite-strings)
+ add_compiler_flags(-Wpointer-arith)
+ add_compiler_flags(-Wcast-qual)
+ add_compiler_flags(-Wformat=2)
+ add_compiler_flags(-Wswitch-default)
+ add_compiler_flags(-Wmissing-include-dirs)
+ add_compiler_flags(-Wcast-align)
+ add_compiler_flags(-Wformat-nonliteral)
+ add_compiler_flags(-Wparentheses)
+ add_compiler_flags(-Winit-self)
+ add_compiler_flags(-Wuninitialized)
+ add_compiler_flags(-Wswitch-enum)
+ add_compiler_flags(-Wno-endif-labels)
+ add_compiler_flags(-Wunused-function)
+ add_compiler_flags(-Wnon-virtual-dtor)
+ add_compiler_flags(-Wno-pmf-conversions)
+ add_compiler_flags(-Wctor-dtor-privacy)
+ add_compiler_flags(-Wsign-promo)
+ add_compiler_flags(-Wsign-conversion)
+ add_compiler_flags(-Wdisabled-optimization)
+ add_compiler_flags(-Weffc++)
+ add_compiler_flags(-Winline)
+ add_compiler_flags(-Winvalid-pch)
+ add_compiler_flags(-Wstack-protector)
+ add_compiler_flags(-Wunsafe-loop-optimizations)
+ add_compiler_flags(-Wmissing-declarations)
+ add_compiler_flags(-Woverloaded-virtual)
+ add_compiler_flags(-Wstrict-null-sentinel)
+ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
+ add_compiler_flags(-Wnoexcept)
+ endif()
+ #add_compiler_flags(-Waggregate-return) # GCC 4.8 does not silence this even with "#pragma GCC diagnostic ignored"
+
+ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+ add_compiler_flags(-Wdouble-promotion)
+ add_compiler_flags(-Wtrampolines)
+ add_compiler_flags(-Wzero-as-null-pointer-constant)
+ add_compiler_flags(-Wuseless-cast)
+ add_compiler_flags(-Wvector-operation-performance)
+ add_compiler_flags(-Wsized-deallocation)
+ endif()
+
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.3)
+ add_compiler_flags(-Wshift-overflow=2)
+ add_compiler_flags(-Wnull-dereference)
+ add_compiler_flags(-Wduplicated-cond)
+ add_compiler_flags(-Wmisleading-indentation)
+ add_compiler_flags(-Wshift-negative-value)
+ endif()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ add_compiler_flags(-Weverything)
+ add_compiler_flags(-Qunused-arguments -fcolor-diagnostics) # needed for ccache integration on travis
+endif()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+ add_compiler_flags(/WX)
+ add_compiler_flags(/W4) # /Wall is too aggressive - even the standard C headers give thousands of errors...
+endif()