[med-svn] [orthanc] 02/03: Fix to use the new version of Google Test in Debian

[Sebastien Jodogne]

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

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 57de92c2cfd79e7700d2a45925efc6414eff687e
Author: jodogne-guest <s.jodogne at gmail.com>
Date:   Sun Nov 20 21:59:56 2016 +0100

    Fix to use the new version of Google Test in Debian
---
 debian/changelog           |  3 +++
 debian/patches/google-test | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9df0117..4da16d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ orthanc (1.1.0+dfsg-3) UNRELEASED; urgency=medium
   [ Gert Wollny and Sebastien Jodogne]
   * Let the dcmtk package take care of importing libssl-dev. Closes: #844835
 
+  [ Sebastien Jodogne ]
+  * Fix to use the new version of Google Test in Debian.
+
  -- Sebastien Jodogne <s.jodogne at gmail.com>  Sun, 20 Nov 2016 15:14:12 +0100
 
 orthanc (1.1.0+dfsg-2) unstable; urgency=medium
diff --git a/debian/patches/google-test b/debian/patches/google-test
new file mode 100644
index 0000000..26d48fa
--- /dev/null
+++ b/debian/patches/google-test
@@ -0,0 +1,48 @@
+Description: Fix to use the new version of Google Test in Debian
+Author: Sebastien Jodogne <s.jodogne at gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-1.1.0/Resources/CMake/GoogleTestConfiguration.cmake
+===================================================================
+--- Orthanc-1.1.0.orig/Resources/CMake/GoogleTestConfiguration.cmake
++++ Orthanc-1.1.0/Resources/CMake/GoogleTestConfiguration.cmake
+@@ -1,9 +1,26 @@
+ if (USE_GTEST_DEBIAN_SOURCE_PACKAGE)
+-  set(GTEST_SOURCES /usr/src/gtest/src/gtest-all.cc)
+-  include_directories(/usr/src/gtest)
++  find_path(GTEST_DEBIAN_SOURCES_DIR
++    NAMES src/gtest-all.cc
++    PATHS
++    /usr/src/gtest
++    /usr/src/googletest/googletest
++    PATH_SUFFIXES src
++    )
++
++  find_path(GTEST_DEBIAN_INCLUDE_DIR
++    NAMES gtest.h
++    PATHS
++    /usr/include/gtest
++    )
+ 
+-  if (NOT EXISTS /usr/include/gtest/gtest.h OR
+-      NOT EXISTS ${GTEST_SOURCES})
++  message("Path to the Debian Google Test sources: ${GTEST_DEBIAN_SOURCES_DIR}")
++  message("Path to the Debian Google Test includes: ${GTEST_DEBIAN_INCLUDE_DIR}")
++
++  set(GTEST_SOURCES ${GTEST_DEBIAN_SOURCES_DIR}/src/gtest-all.cc)
++  include_directories(${GTEST_DEBIAN_SOURCES_DIR})
++
++  if (NOT EXISTS ${GTEST_SOURCES} OR
++      NOT EXISTS ${GTEST_DEBIAN_INCLUDE_DIR}/gtest.h)
+     message(FATAL_ERROR "Please install the libgtest-dev package")
+   endif()
+ 
+@@ -28,6 +45,8 @@ elseif (STATIC_BUILD OR NOT USE_SYSTEM_G
+     add_definitions(/D _VARIADIC_MAX=10)
+   endif()
+ 
++  source_group(ThirdParty\\GoogleTest REGULAR_EXPRESSION ${GTEST_SOURCES_DIR}/.*)
++
+ else()
+   include(FindGTest)
+   if (NOT GTEST_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
index 2c63196..db9a37c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 cmake-dcmtk
+google-test

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/orthanc.git