Mercurial > hg > orthanc

changeset 3281:ea54109a7312

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade to GoogleTest 1.8.1
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Feb 2019 16:30:23 +0100
parents fddf3ceed7e5
children e8ce77f3dec1
files NEWS Resources/CMake/GoogleTestConfiguration.cmake Resources/Patches/dcmtk-3.6.4.patch
diffstat 3 files changed, 16 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Thu Feb 21 15:46:13 2019 +0100
+++ b/NEWS	Thu Feb 21 16:30:23 2019 +0100
@@ -25,6 +25,7 @@
 * New CMake option: "-DMSVC_MULTIPLE_PROCESSES=ON" for parallel build with Visual Studio
 * Upgraded dependencies for static and Windows builds:
   - DCMTK 3.6.4
+  - GoogleTest 1.8.1
 
 
 Version 1.5.4 (2019-02-08)
--- a/Resources/CMake/GoogleTestConfiguration.cmake	Thu Feb 21 15:46:13 2019 +0100
+++ b/Resources/CMake/GoogleTestConfiguration.cmake	Thu Feb 21 16:30:23 2019 +0100
@@ -28,19 +28,20 @@
   endif()
 
 elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST)
-  set(GOOGLE_TEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/gtest-1.7.0)
-  set(GOOGLE_TEST_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gtest-1.7.0.zip")
-  set(GOOGLE_TEST_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7")
+  set(GOOGLE_TEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/googletest-release-1.8.1)
+  set(GOOGLE_TEST_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gtest-1.8.1.tar.gz")
+  set(GOOGLE_TEST_MD5 "2e6fbeb6a91310a16efe181886c59596")
 
   DownloadPackage(${GOOGLE_TEST_MD5} ${GOOGLE_TEST_URL} "${GOOGLE_TEST_SOURCES_DIR}")
 
   include_directories(
-    ${GOOGLE_TEST_SOURCES_DIR}/include
+    ${GOOGLE_TEST_SOURCES_DIR}/googletest
+    ${GOOGLE_TEST_SOURCES_DIR}/googletest/include
     ${GOOGLE_TEST_SOURCES_DIR}
     )
 
   set(GOOGLE_TEST_SOURCES
-    ${GOOGLE_TEST_SOURCES_DIR}/src/gtest-all.cc
+    ${GOOGLE_TEST_SOURCES_DIR}/googletest/src/gtest-all.cc
     )
 
   # https://code.google.com/p/googletest/issues/detail?id=412
--- a/Resources/Patches/dcmtk-3.6.4.patch	Thu Feb 21 15:46:13 2019 +0100
+++ b/Resources/Patches/dcmtk-3.6.4.patch	Thu Feb 21 16:30:23 2019 +0100
@@ -1,14 +1,16 @@
 diff -urEb dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc
 --- dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc	2019-02-21 15:30:21.657110805 +0100
-+++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc	2019-02-21 15:41:01.565099612 +0100
-@@ -28,6 +28,7 @@
- #include "dcmtk/ofstd/ofstdinc.h"
++++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc	2019-02-21 16:28:43.721049550 +0100
+@@ -36,6 +36,9 @@
+ #include "dcmtk/dcmdata/dcostrma.h"    /* for class DcmOutputStream */
+ #include "dcmtk/dcmdata/dcwcache.h"    /* for class DcmWriteCache */
  
- #include "dcmtk/ofstd/ofstream.h"
++#undef max
 +#include "dcmtk/ofstd/oflimits.h"
- #include "dcmtk/dcmdata/dcpxitem.h"
- #include "dcmtk/dcmdata/dcswap.h"
- #include "dcmtk/ofstd/ofstring.h"
++
+ 
+ // ********************************
+ 
 diff -urEb dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h
 --- dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h	2019-02-21 15:30:21.645110805 +0100
 +++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h	2019-02-21 15:30:48.273110339 +0100