[Gdcm-hackers] gdcm-git:Grassroots DICOM branch master updated. 074872fbe04afd5a77e33cfa58caa44f04f
Cross-platform DICOM implementation
Brought to you by:
malat
|
From: Mathieu M. <ma...@us...> - 2019-02-11 13:32:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".
The branch, master has been updated
via 074872fbe04afd5a77e33cfa58caa44f04f73ef5 (commit)
via 7380fbc63f6be238d1b2836c4b67043b38470bc0 (commit)
via 9f384da0131cb6374bff102fa289ad9595b65eb3 (commit)
via e98bda90c57f22a6cd9a35bfe22b8c26ba90188f (commit)
via 21c6d86537ce4f0a09fcc595616ed11b03a6faae (commit)
via 815caa813f633bc59538c3c47857f1d9482a76c0 (commit)
via 0d903faa5b7a122da694bc1045aba68fb09b6734 (commit)
from 4e583ed3b47cd0b7bbdb23cd417c77d20f39a223 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/074872fbe04afd5a77e33cfa58caa44f04f73ef5/
commit 074872fbe04afd5a77e33cfa58caa44f04f73ef5
Merge: 4e583ed3b 7380fbc63
Author: Mathieu Malaterre <mat...@gm...>
Date: Mon Feb 11 14:31:50 2019 +0100
Merge branch 'release'
Conflicts:
Utilities/socketxx/CMakeLists.txt
diff --cc Utilities/socketxx/CMakeLists.txt
index cd73413df,6f8a6aa52..ce15b8aa4
--- a/Utilities/socketxx/CMakeLists.txt
+++ b/Utilities/socketxx/CMakeLists.txt
@@@ -1,12 -1,14 +1,16 @@@
-cmake_minimum_required(VERSION 2.8.7)
+if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
+ cmake_minimum_required(VERSION 2.8.7)
+endif()
- if(POLICY CMP0022)
- cmake_policy(SET CMP0022 NEW)
- endif()
- if(POLICY CMP0063)
- cmake_policy(SET CMP0063 NEW)
- endif()
+
+ foreach(p
+ CMP0022
+ CMP0042
+ CMP0063 # CMake 3.3.2
+ )
+ if(POLICY ${p})
+ cmake_policy(SET ${p} NEW)
+ endif()
+ endforeach()
# http://www.linuxhacker.at/socketxx
if(NOT SOCKETXX_NAMESPACE)
-----------------------------------------------------------------------
Summary of changes:
.../gdcmBasicOffsetTable.h | 7 +++++--
.../gdcmSequenceOfFragments.h | 6 +++++-
Testing/Source/Common/Cxx/TestSHA1.cxx | 3 ++-
Utilities/gdcmcharls/CMakeLists.txt | 11 ++++++++---
Utilities/gdcmjpeg/CMakeLists.txt | 11 ++++++++---
Utilities/gdcmopenjpeg/CMakeLists.txt | 12 +++++++++---
Utilities/gdcmuuid/CMakeLists.txt | 11 ++++++++---
Utilities/socketxx/CMakeLists.txt | 16 ++++++++++------
8 files changed, 55 insertions(+), 22 deletions(-)
hooks/post-receive
--
Grassroots DICOM
|