diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2018-04-19 12:11:55 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2018-04-19 12:11:55 +0200 |
| commit | e71601bdc6e1df905aca36baa6e8e85096397f80 (patch) | |
| tree | 6fdeea27d6b55e713554216b00b6922d3451a504 /CMakeLists.txt | |
| parent | 5b36f06f49c88fb1921da18f54524081729cb4d5 (diff) | |
| parent | bc4e9c7bcfd7d7b3f62b23e583ef216a05975e80 (diff) | |
| download | libnitrokey-e71601bdc6e1df905aca36baa6e8e85096397f80.tar.gz libnitrokey-e71601bdc6e1df905aca36baa6e8e85096397f80.tar.bz2 | |
Merge branch '97-compilation_warnings'
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 073e7fd..06fcfac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,7 @@ set_target_properties(nitrokey PROPERTIES OPTION(ERROR_ON_WARNING "Stop compilation on warning found (not supported for MSVC)" OFF) if (NOT MSVC) - set(COMPILE_FLAGS "-Wall -Wno-unused-function -Wcast-qual -Woverloaded-virtual") + set(COMPILE_FLAGS "-Wall -Wno-unused-function -Wcast-qual -Woverloaded-virtual -Wsign-compare -Wformat -Wformat-security") IF(NOT APPLE) if (ERROR_ON_WARNING) set(COMPILE_FLAGS "${COMPILE_FLAGS} -Werror") @@ -167,34 +167,32 @@ ENDIF() IF(COMPILE_OFFLINE_TESTS) add_executable (test_offline unittest/test_offline.cc) target_link_libraries (test_offline ${EXTRA_LIBS} nitrokey catch) + SET_TARGET_PROPERTIES(test_offline PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS} ) #run with 'make test' or 'ctest' include (CTest) add_test (runs test_offline) ENDIF() IF (COMPILE_TESTS) - #needs connected PRO device for success - #warning: it may delete data on the device - add_executable (test_C_API unittest/test_C_API.cpp) - target_link_libraries (test_C_API ${EXTRA_LIBS} nitrokey catch) - - add_executable (test2 unittest/test2.cc) - target_link_libraries (test2 ${EXTRA_LIBS} nitrokey catch) - - add_executable (test3 unittest/test3.cc) - target_link_libraries (test3 ${EXTRA_LIBS} nitrokey catch) - - add_executable (test_HOTP unittest/test_HOTP.cc) - target_link_libraries (test_HOTP ${EXTRA_LIBS} nitrokey catch) - - add_executable (test1 unittest/test.cc) - target_link_libraries (test1 ${EXTRA_LIBS} nitrokey catch) - - add_executable (test_issues unittest/test_issues.cc) - target_link_libraries (test_issues ${EXTRA_LIBS} nitrokey catch) - - add_executable (test_multiple_devices unittest/test_multiple_devices.cc) - target_link_libraries (test_multiple_devices ${EXTRA_LIBS} nitrokey catch) + #needs connected Pro/Storage devices for success + #WARNING: it may delete data on the device + + SET(TESTS + unittest/test_C_API.cpp + unittest/test2.cc + unittest/test3.cc + unittest/test_HOTP.cc + unittest/test1.cc + unittest/test_issues.cc + unittest/test_multiple_devices.cc + ) + + foreach(testsourcefile ${TESTS} ) + get_filename_component(testname ${testsourcefile} NAME_WE ) + add_executable(${testname} ${testsourcefile} ) + target_link_libraries(${testname} ${EXTRA_LIBS} nitrokey catch ) + SET_TARGET_PROPERTIES(${testname} PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS} ) + endforeach(testsourcefile) ENDIF() |