Commit a4d30ec5 authored by Harald Scheirich's avatar Harald Scheirich
Browse files

Merge branch 'fix/update-gtest' into 'master'

BUG: Fix death test on linux

See merge request !683
parents 6c958424 a8e3e4e0
Pipeline #248323 passed with stage
in 0 seconds
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
include(imstkAddExternalProject) include(imstkAddExternalProject)
imstk_add_external_project( GTest imstk_add_external_project( GTest
URL https://github.com/google/googletest/archive/53495a2a7d6ba7e0691a7f3602e9a5324bba6e45.zip URL https://github.com/google/googletest/archive/40dfd4b775a66979ad1bd19321cdfd0feadfea27.zip
URL_MD5 8349ef674d27b005a43ce3679cb04947 URL_MD5 222793254ade8010fe6ff000f18c6b15
CMAKE_CACHE_ARGS CMAKE_CACHE_ARGS
-DBUILD_GMOCK:BOOL=ON -DBUILD_GMOCK:BOOL=ON
-DBUILD_GTEST:BOOL=ON -DBUILD_GTEST:BOOL=ON
...@@ -14,6 +14,7 @@ imstk_add_external_project( GTest ...@@ -14,6 +14,7 @@ imstk_add_external_project( GTest
RELATIVE_INCLUDE_PATH "" RELATIVE_INCLUDE_PATH ""
#VERBOSE #VERBOSE
) )
if(NOT USE_SYSTEM_GTest) if(NOT USE_SYSTEM_GTest)
set(GTest_DIR ${CMAKE_INSTALL_PREFIX}/lib/cmake/GTest) set(GTest_DIR ${CMAKE_INSTALL_PREFIX}/lib/cmake/GTest)
#message(STATUS "GTest_DIR : ${GTest_DIR}") #message(STATUS "GTest_DIR : ${GTest_DIR}")
......
...@@ -48,5 +48,6 @@ main(int argc, char** argv) ...@@ -48,5 +48,6 @@ main(int argc, char** argv)
logger.addFileSink("test", "log"); logger.addFileSink("test", "log");
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
GTEST_FLAG_SET(death_test_style, "threadsafe");
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment