[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. 7380fbc63f6be238d1b2836c4b67043b38
Cross-platform DICOM implementation
Brought to you by:
malat
|
From: Mathieu M. <ma...@us...> - 2019-02-11 13:29:35
|
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, release has been updated
via 7380fbc63f6be238d1b2836c4b67043b38470bc0 (commit)
via 9f384da0131cb6374bff102fa289ad9595b65eb3 (commit)
via 815caa813f633bc59538c3c47857f1d9482a76c0 (commit)
from e98bda90c57f22a6cd9a35bfe22b8c26ba90188f (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/7380fbc63f6be238d1b2836c4b67043b38470bc0/
commit 7380fbc63f6be238d1b2836c4b67043b38470bc0
Merge: e98bda90c 9f384da01
Author: Mathieu Malaterre <mat...@gm...>
Date: Mon Feb 11 14:28:52 2019 +0100
Merge remote-tracking branch 'github/release' into release
https://sourceforge.net/p/gdcm/gdcm/ci/9f384da0131cb6374bff102fa289ad9595b65eb3/
commit 9f384da0131cb6374bff102fa289ad9595b65eb3
Merge: 3fb24e60f 815caa813
Author: Mathieu Malaterre <mat...@gm...>
Date: Mon Feb 11 14:27:09 2019 +0100
Merge pull request #83 from blowekamp/FixCMP0042WarningAndRuntimeIssue
Address CMP0042 MACOSX_RPATH warning with shared libraried
https://sourceforge.net/p/gdcm/gdcm/ci/815caa813f633bc59538c3c47857f1d9482a76c0/
commit 815caa813f633bc59538c3c47857f1d9482a76c0
Author: Bradley Lowekamp <blo...@ma...>
Date: Fri Feb 8 17:25:24 2019 -0500
Address CMP0042 MACOSX_RPATH warning with shared libraried
When shared libraries are enabled in ITK the CMake CMP0042 warning
occour for several utility libraries. Additionally, there has been
runtime dependency loading issues too. Setting the policy to NEW
resolves both issues.
diff --git a/Utilities/gdcmcharls/CMakeLists.txt b/Utilities/gdcmcharls/CMakeLists.txt
index eb940597c..5a1e777d1 100644
--- a/Utilities/gdcmcharls/CMakeLists.txt
+++ b/Utilities/gdcmcharls/CMakeLists.txt
@@ -9,9 +9,14 @@ string(TOLOWER ${CHARLS_NAMESPACE} CHARLS_LIBRARY_NAME)
project(${CHARLS_NAMESPACE} CXX)
-if(POLICY CMP0063)
- cmake_policy(SET CMP0063 NEW)
-endif()
+foreach(p
+ CMP0042
+ CMP0063
+ )
+ if(POLICY ${p})
+ cmake_policy(SET ${p} NEW)
+ endif()
+endforeach()
#-----------------------------------------------------------------------------
# CHARLS version number
diff --git a/Utilities/gdcmjpeg/CMakeLists.txt b/Utilities/gdcmjpeg/CMakeLists.txt
index c687acd09..b39611d3f 100644
--- a/Utilities/gdcmjpeg/CMakeLists.txt
+++ b/Utilities/gdcmjpeg/CMakeLists.txt
@@ -15,9 +15,14 @@ string(TOLOWER ${JPEG_NAMESPACE} JPEG_LIBRARY_NAME)
project(${JPEG_NAMESPACE} C)
-if(POLICY CMP0063)
- cmake_policy(SET CMP0063 NEW)
-endif()
+foreach(p
+ CMP0042
+ CMP0063
+ )
+ if(POLICY ${p})
+ cmake_policy(SET ${p} NEW)
+ endif()
+endforeach()
# Do full dependency headers.
include_regular_expression("^.*$")
diff --git a/Utilities/gdcmopenjpeg/CMakeLists.txt b/Utilities/gdcmopenjpeg/CMakeLists.txt
index 39a8da99b..60d9f8981 100644
--- a/Utilities/gdcmopenjpeg/CMakeLists.txt
+++ b/Utilities/gdcmopenjpeg/CMakeLists.txt
@@ -14,9 +14,15 @@ if(COMMAND CMAKE_POLICY)
if (NOT (${CMAKE_VERSION} VERSION_LESS 3.0))
cmake_policy(SET CMP0042 NEW)
endif()
- if(POLICY CMP0063)
- cmake_policy(SET CMP0063 NEW)
- endif()
+
+ foreach(p
+ CMP0042
+ CMP0063
+ )
+ if(POLICY ${p})
+ cmake_policy(SET ${p} NEW)
+ endif()
+ endforeach()
endif()
if(NOT OPENJPEG_NAMESPACE)
diff --git a/Utilities/gdcmuuid/CMakeLists.txt b/Utilities/gdcmuuid/CMakeLists.txt
index 9ec344d7c..e5acbe425 100644
--- a/Utilities/gdcmuuid/CMakeLists.txt
+++ b/Utilities/gdcmuuid/CMakeLists.txt
@@ -9,9 +9,14 @@ string(TOLOWER ${UUID_NAMESPACE} UUID_LIBRARY_NAME)
project(${UUID_NAMESPACE} C)
-if(POLICY CMP0063)
- cmake_policy(SET CMP0063 NEW)
-endif()
+foreach(p
+ CMP0042
+ CMP0063
+ )
+ if(POLICY ${p})
+ cmake_policy(SET ${p} NEW)
+ endif()
+endforeach()
# Do full dependency headers.
include_regular_expression("^.*$")
diff --git a/Utilities/socketxx/CMakeLists.txt b/Utilities/socketxx/CMakeLists.txt
index 424154fab..6f8a6aa52 100644
--- a/Utilities/socketxx/CMakeLists.txt
+++ b/Utilities/socketxx/CMakeLists.txt
@@ -1,10 +1,14 @@
cmake_minimum_required(VERSION 2.8.7)
-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:
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 ++++++++++------
5 files changed, 43 insertions(+), 18 deletions(-)
hooks/post-receive
--
Grassroots DICOM
|