diff --git a/radio/src/tests/CMakeLists.txt b/radio/src/tests/CMakeLists.txt index a3611ac49..395b54b20 100644 --- a/radio/src/tests/CMakeLists.txt +++ b/radio/src/tests/CMakeLists.txt @@ -10,33 +10,33 @@ if(GTEST_INCDIR AND GTEST_SRCDIR AND Qt5Widgets_FOUND) set(TESTS_PATH ${RADIO_SRC_DIRECTORY}) configure_file(${RADIO_SRC_DIRECTORY}/tests/location.h.in ${CMAKE_CURRENT_BINARY_DIR}/location.h @ONLY) include_directories(${CMAKE_CURRENT_BINARY_DIR}) - + if(WIN32) target_include_directories(gtests-lib PUBLIC ${WIN_INCLUDE_DIRS}) target_link_libraries(gtests-lib PRIVATE ${WIN_LINK_LIBRARIES}) endif(WIN32) - + if(SDL_FOUND AND SIMU_AUDIO) target_include_directories(gtests-lib PUBLIC ${SDL_INCLUDE_DIR}) target_link_libraries(gtests-lib PRIVATE ${SDL_LIBRARY}) endif() - + foreach(FILE ${SRC}) set(RADIO_SRC ${RADIO_SRC} ../${FILE}) endforeach() - + file(GLOB TEST_SRC_FILES ${RADIO_SRC_DIRECTORY}/tests/*.cpp) - + if(MINGW) # struct packing breaks on MinGW w/out -mno-ms-bitfields: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991 & http://stackoverflow.com/questions/24015852/struct-packing-and-alignment-with-mingw set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields") endif() set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0") - - use_cxx11() # ensure gnu++11 in CXX_FLAGS with CMake < 3.1 - - add_executable(gtests EXCLUDE_FROM_ALL ${TEST_SRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/location.h ${RADIO_SRC} ../targets/simu/simpgmspace.cpp ../targets/simu/simueeprom.cpp) + + use_cxx11() # ensure gnu++11 in CXX_FLAGS with CMake < 3.1 + + add_executable(gtests EXCLUDE_FROM_ALL ${TEST_SRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/location.h ${RADIO_SRC} ../targets/simu/simpgmspace.cpp ../targets/simu/simueeprom.cpp) qt5_use_modules(gtests Core Widgets) add_dependencies(gtests ${FIRMWARE_DEPENDENCIES} gtests-lib) target_link_libraries(gtests gtests-lib pthread) diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh index a276add84..f71d155f7 100755 --- a/tools/commit-tests.sh +++ b/tools/commit-tests.sh @@ -27,7 +27,7 @@ else fi SRCDIR=$(dirname "$SCRIPT")/.. -COMMON_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=/opt/qt55 -DWARNINGS_AS_ERRORS=YES -DVERBOSE_CMAKELISTS=YES -DCMAKE_RULE_MESSAGES=OFF -Wno-dev" +COMMON_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=/opt/qt55 -DTRACE_SIMPGMSPACE=NO -DWARNINGS_AS_ERRORS=YES -DVERBOSE_CMAKELISTS=YES -DCMAKE_RULE_MESSAGES=OFF -Wno-dev" mkdir build || true cd build