[dolphin-emu] 13/18: Refresh gtest patch

[James Cowgill]

This is an automated email from the git hooks/post-receive script.

jcowgill pushed a commit to branch master
in repository dolphin-emu.

commit f4c1b023f87f93fdb785bf563b373af71ebba1c0
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Thu Apr 28 00:33:24 2016 +0100

    Refresh gtest patch
---
 debian/patches/01_shared-gtest.patch | 43 +++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/debian/patches/01_shared-gtest.patch b/debian/patches/01_shared-gtest.patch
index c128dd6..c182da7 100644
--- a/debian/patches/01_shared-gtest.patch
+++ b/debian/patches/01_shared-gtest.patch
@@ -1,33 +1,30 @@
-Description: Allow dolphin to build against a shared copy of gtest
+Description: Debian only ships the source of gtest rather than a library.
+ Add GTEST_DIR to specify the location of the gtest SOURCE to be built along
+ with dolphin.
 Author: James Cowgill <jcowgill at debian.org>
-Forwarded: no
+Forwarded: not-needed
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -13,6 +13,7 @@ option(ENABLE_QT2 "Enable Qt2 (use the o
- option(ENABLE_PCH "Use PCH to speed up compilation" ON)
- option(ENABLE_LTO "Enables Link Time Optimization" OFF)
- option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
-+set(GTEST_DIR "" CACHE STRING "Optional path to a shared copy gtest")
- 
- # Enable SDL for default on operating systems that aren't OSX, Android, Linux or Windows.
- if(NOT APPLE AND NOT ANDROID AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT MSVC)
-@@ -874,8 +875,15 @@ include_directories("${PROJECT_BINARY_DI
- ########################################
+@@ -8,6 +8,7 @@ option(USE_EGL "Enables EGL OpenGL Inter
+ option(TRY_X11 "Enables X11 Support" ON)
+ option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF)
+ option(USE_SHARED_GTEST "Use shared gtest library if found" OFF)
++set(GTEST_DIR "" CACHE STRING "Optional path to a gtest source")
+ option(USE_UPNP "Enables UPnP port mapping support" ON)
+ option(DISABLE_WX "Disable wxWidgets (use Qt or CLI interface)" OFF)
+ option(ENABLE_QT2 "Enable Qt2 (use the other experimental Qt interface)" OFF)
+@@ -909,7 +910,11 @@ include_directories("${PROJECT_BINARY_DI
  # Unit testing.
  #
--include_directories(Externals/gtest/include)
--add_subdirectory(Externals/gtest)
-+if ("${GTEST_DIR}" STREQUAL "")
-+	message("Using gtest from Externals")
-+	include_directories(Externals/gtest/include)
-+	add_subdirectory(Externals/gtest)
-+else()
+ include(FindGTest)
+-if(GTEST_FOUND AND USE_SHARED_GTEST)
++if(NOT ("${GTEST_DIR}" STREQUAL ""))
 +	message("Using shared gtest in ${GTEST_DIR}")
 +	include_directories(${GTEST_DIR} ${GTEST_DIR}/include)
 +	add_library(gtest EXCLUDE_FROM_ALL ${GTEST_DIR}/src/gtest-all.cc ${GTEST_DIR}/src/gtest_main.cc)
-+endif()
- 
- enable_testing()
- add_custom_target(unittests)
++elseif(GTEST_FOUND AND USE_SHARED_GTEST)
+ 	message("Using shared gtest")
+ 	include_directories(${GTEST_INCLUDE_DIRS})
+ else()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dolphin-emu.git