fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-29 23:24:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

gtest: fix poisoned exit in compile flags

Browse Source 
visibility.h is included globally in PX4 via cmake compile flags.
It contains poisoning the exit() command which is used by gtest
to close the test application. Removing the flag for gtest compilation
fixes the compile error:
gtest.cc:4757:7: error: attempt to use poisoned "exit"
This commit is contained in:
Matthias Grob 2019-03-10 15:14:08 +01:00
parent 8eb0d66279
commit f5f95635b4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/gtest/gtest.cmake
View File

@ -41,3 +41,9 @@ endif()
# Add googletest, defines gtest and gtest_main targets
add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src ${CMAKE_CURRENT_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL)
# Remove visibility.h from the compile flags for gtest because of poisoned exit()
get_target_property(GTEST_COMPILE_FLAGS gtest COMPILE_OPTIONS)
list(REMOVE_ITEM GTEST_COMPILE_FLAGS "-include")
list(REMOVE_ITEM GTEST_COMPILE_FLAGS "visibility.h")
set_target_properties(gtest PROPERTIES COMPILE_OPTIONS "${GTEST_COMPILE_FLAGS}")

2
src/include/visibility.h
View File

@ -86,7 +86,7 @@
#ifdef __cplusplus
#include <cstdlib>
#endif
//#pragma GCC poison exit
#pragma GCC poison exit
#include <stdlib.h>