Skip to content

Commit

Permalink
GDCM 2019-02-08 (815caa81)
Browse files Browse the repository at this point in the history
Code extracted from:

    https://github.com/blowekamp/GDCM.git

at commit 815caa813f633bc59538c3c47857f1d9482a76c0 (FixCMP0042WarningAndRuntimeIssue).

Change-Id: I3bf573a4ace9434a25da31fd64b387f5138a87b1
  • Loading branch information
GDCM Upstream authored and blowekamp committed Feb 9, 2019
1 parent 2204e7c commit 70ca4da
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 18 deletions.
11 changes: 8 additions & 3 deletions Utilities/gdcmcharls/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions Utilities/gdcmjpeg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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("^.*$")
Expand Down
12 changes: 9 additions & 3 deletions Utilities/gdcmopenjpeg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
11 changes: 8 additions & 3 deletions Utilities/gdcmuuid/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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("^.*$")
Expand Down
16 changes: 10 additions & 6 deletions Utilities/socketxx/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 70ca4da

Please sign in to comment.