Merge pull request #15913 from neheb/sum

sumo: fix compilation when gtest is present
2021-06-20 23:37:44 -07:00 · 2021-06-20 23:37:44 -07:00 · b3510c69dd
parent 93c1821ee4 caa2cc5cc1
commit b3510c69dd
1 changed files with 10 additions and 0 deletions
--- a/utils/sumo/patches/010-gtest.patch
+++ b/utils/sumo/patches/010-gtest.patch
@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -339,7 +339,6 @@ if (SUMO_LIBRARIES AND WIN32)
+     file(GLOB TEXTTEST_EXECUTABLE "${SUMO_LIBRARIES}/TextTest-*/texttest.exe")
+ else ()
+     # for Linux and Mac only
+-    find_package(GTest)
+ endif ()
+ 
+ find_package(XercesC REQUIRED)