Merge branch 'release'

CMakeLists.txt

@@ -8,7 +8,7 @@ if("${CMAKE_VERSION}" VERSION_LESS_EQUAL "${GDCM_MAX_VALIDATED_CMAKE_VERSION}")
 else()
   set(GDCM_CMAKE_POLICY_VERSION "${GDCM_MAX_VALIDATED_CMAKE_VERSION}")
 endif()
-cmake_policy(VERSION ${GDCM_CMAKE_POLICY_VERSION}) 
+cmake_policy(VERSION ${GDCM_CMAKE_POLICY_VERSION})
 
 # GDCM version 3.0.0 will only support C++11 and greater
 if(CMAKE_CXX_STANDARD EQUAL "98" )
@@ -23,7 +23,7 @@ project(GDCM
 ## NOTE: the "DESCRIPTION" feature of project() was introduced in cmake 3.10.0
 set(PROJECT_DESCRIPTION "GDCM - Grassroots DICOM. GDCM is yet another DICOM library.")
 
-## Set aliases for backwards compatibility.  GDCM_VERSION_XXX are configured by the project() command 
+## Set aliases for backwards compatibility.  GDCM_VERSION_XXX are configured by the project() command
 set(GDCM_MAJOR_VERSION ${GDCM_VERSION_MAJOR})
 set(GDCM_MINOR_VERSION ${GDCM_VERSION_MINOR})
 set(GDCM_BUILD_VERSION ${GDCM_VERSION_PATCH})
@@ -564,7 +564,10 @@ if(APPLE)
   if(GDCM_USE_COREFOUNDATION_LIBRARY)
     find_library(COREFOUNDATION_LIBRARY CoreFoundation )
   endif()
-  mark_as_advanced(COREFOUNDATION_LIBRARY)
+  mark_as_advanced(
+    GDCM_USE_COREFOUNDATION_LIBRARY
+    COREFOUNDATION_LIBRARY
+    )
 endif()
 
 #-----------------------------------------------------------------------------

Utilities/gdcmopenjpeg/CMakeLists.txt

@@ -166,8 +166,15 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
 endif()
 
 if (APPLE)
-	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
-	option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
+  if (${CMAKE_VERSION} VERSION_LESS 3.0)
+    # For cmake >= 3.0, we turn on CMP0042 and
+    # https://cmake.org/cmake/help/v3.0/policy/CMP0042.html mentions
+    # "Projects wanting @rpath in a target’s install name may remove any
+    # setting of the INSTALL_NAME_DIR and CMAKE_INSTALL_NAME_DIR variables"
+    list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
+  endif()
+  option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
+  mark_as_advanced(OPJ_USE_DSYMUTIL)
 endif()
 
 #-----------------------------------------------------------------------------