Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
iMSTK
iMSTK
Commits
a4d30ec5
Commit
a4d30ec5
authored
Sep 23, 2021
by
Harald Scheirich
Browse files
Merge branch 'fix/update-gtest' into 'master'
BUG: Fix death test on linux See merge request
iMSTK/iMSTK!683
parents
6c958424
a8e3e4e0
Pipeline
#248323
passed with stage
in 0 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMake/External/External_GTest.cmake
View file @
a4d30ec5
...
...
@@ -3,8 +3,8 @@
#-----------------------------------------------------------------------------
include
(
imstkAddExternalProject
)
imstk_add_external_project
(
GTest
URL https://github.com/google/googletest/archive/
53495a2a7d6ba7e0691a7f3602e9a5324bba6e45
.zip
URL_MD5
8349ef674d27b005a43ce3679cb04947
URL https://github.com/google/googletest/archive/
40dfd4b775a66979ad1bd19321cdfd0feadfea27
.zip
URL_MD5
222793254ade8010fe6ff000f18c6b15
CMAKE_CACHE_ARGS
-DBUILD_GMOCK:BOOL=ON
-DBUILD_GTEST:BOOL=ON
...
...
@@ -14,6 +14,7 @@ imstk_add_external_project( GTest
RELATIVE_INCLUDE_PATH
""
#VERBOSE
)
if
(
NOT USE_SYSTEM_GTest
)
set
(
GTest_DIR
${
CMAKE_INSTALL_PREFIX
}
/lib/cmake/GTest
)
#message(STATUS "GTest_DIR : ${GTest_DIR}")
...
...
Source/Testing/imstkTestingMain.cpp
View file @
a4d30ec5
...
...
@@ -48,5 +48,6 @@ main(int argc, char** argv)
logger
.
addFileSink
(
"test"
,
"log"
);
::
testing
::
InitGoogleTest
(
&
argc
,
argv
);
GTEST_FLAG_SET
(
death_test_style
,
"threadsafe"
);
return
RUN_ALL_TESTS
();
}
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment