Sophie

Sophie

distrib > Mageia > 7 > i586 > media > core-updates-src > by-pkgid > a6447e2dbf3894f037ab1d8fc8a7526c > files > 1

synergy-1.13.0-1.mga7.src.rpm

diff -Nrup a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt	2020-12-29 14:53:13.000000000 +0100
+++ b/CMakeLists.txt	2020-12-30 14:41:25.521419070 +0100
@@ -72,7 +72,6 @@ endif()
 
 
 set (libs)
-include_directories (BEFORE SYSTEM ${PROJECT_SOURCE_DIR}/ext/googletest/googletest/include)
 
 if (UNIX)
     if (NOT APPLE)
@@ -347,13 +346,6 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURC
   endif()
 endif()
 
-#
-# Google Test
-#
-if(BUILD_TESTS AND NOT EXISTS "${PROJECT_SOURCE_DIR}/ext/googletest/CMakeLists.txt")
-  message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.")
-endif()
-
 
 #
 # Configure_file... but for directories, recursively.
diff -Nrup a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
--- a/src/test/CMakeLists.txt	2020-12-29 14:53:13.000000000 +0100
+++ b/src/test/CMakeLists.txt	2020-12-30 14:41:57.188670560 +0100
@@ -14,20 +14,5 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-include_directories(
-    ../../ext/googletest/googletest
-    ../../ext/googletest/googletest/include
-    ../../ext/googletest/googlemock
-    ../../ext/googletest/googlemock/include)
-    
-add_library(gtest STATIC ../../ext/googletest/googletest/src/gtest-all.cc)
-add_library(gmock STATIC ../../ext/googletest/googlemock/src/gmock-all.cc)
-
-if (UNIX)
-    # ignore warnings in gtest and gmock
-    set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
-    set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
-endif()
-
 add_subdirectory(integtests)
 add_subdirectory(unittests)
diff -Nrup a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
--- a/src/test/integtests/CMakeLists.txt	2020-12-29 14:53:13.000000000 +0100
+++ b/src/test/integtests/CMakeLists.txt	2020-12-30 14:42:13.747802002 +0100
@@ -56,8 +56,6 @@ endif()
 include_directories(
     ../../
     ../../lib/
-    ../../../ext/googletest/googletest/include
-    ../../../ext/googletest/googlemock/include
 )
 
 if (UNIX)