Merge branch 'release-5.4' into release

Author: thewtex

Modules/Core/SpatialObjects/include/itkSpatialObjectProperty.h

@@ -96,11 +96,13 @@ class ITKSpatialObjects_EXPORT SpatialObjectProperty
     m_Name = name;
   }
 
+#if !defined(ITK_WRAPPING_PARSER)
   std::string &
   GetName()
   {
     return m_Name;
   }
+#endif
 
   const std::string &
   GetName() const
@@ -123,15 +125,13 @@ class ITKSpatialObjects_EXPORT SpatialObjectProperty
     return value;
   }
 
+
+#if !defined(ITK_WRAPPING_PARSER)
   bool
   GetTagStringValue(const std::string & tag, std::string & value) const;
+#endif
   std::string
-  GetTagStringValue(const std::string & tag) const
-  {
-    std::string value = "";
-    this->GetTagStringValue(tag, value);
-    return value;
-  }
+  GetTagStringValue(const std::string & tag) const;
 
 
   std::map<std::string, double> &

Modules/Core/SpatialObjects/src/itkSpatialObjectProperty.cxx

@@ -137,6 +137,15 @@ SpatialObjectProperty::GetTagStringValue(const std::string & tag, std::string &
   }
 }
 
+
+std::string
+SpatialObjectProperty::GetTagStringValue(const std::string & tag) const
+{
+  std::string value = "";
+  this->GetTagStringValue(tag, value);
+  return value;
+}
+
 std::map<std::string, double> &
 SpatialObjectProperty::GetTagScalarDictionary()
 {

Modules/ThirdParty/TIFF/CMakeLists.txt

@@ -8,17 +8,16 @@ if(ITK_USE_SYSTEM_TIFF)
   find_package(TIFF REQUIRED)
   set(ITKTIFF_INCLUDE_DIRS
     ${ITKTIFF_BINARY_DIR}/src
+    ${TIFF_INCLUDE_DIRS}
     )
-  set(ITKTIFF_SYSTEM_INCLUDE_DIRS
-    ${TIFF_INCLUDE_DIR}
-    )
+
   set(ITKTIFF_LIBRARIES "${TIFF_LIBRARIES}")
   set(ITKTIFF_NO_SRC 1)
 
   # Check availability of different methods to access TIFF's field
   # data structure.
   include(CheckTypeSize)
-  set(CMAKE_REQUIRED_INCLUDES ${ITKTIFF_SYSTEM_INCLUDE_DIRS})
+  set(CMAKE_REQUIRED_LIBRARIES TIFF::TIFF)
   set(CMAKE_EXTRA_INCLUDE_FILES "tiffio.h")
   check_type_size(TIFFFieldReadCount ITK_TIFF_HAS_TIFFFieldReadCount)
   check_type_size(TIFFField*  ITK_TIFF_HAS_TIFFField)