MRG

CMake/ImportMapnik.cmake

@@ -67,7 +67,7 @@ IF(OTB_USE_MAPNIK)
         # Add compiler option
         ADD_DEFINITIONS(-DOTB_USE_MAPNIK)
 
-        INCLUDE_DIRECTORIES(${MAPNIK_INCLUDE_DIR} ${ICUUC_INCLUDE_DIR} ${LTDL_INCLUDE_DIR})
+        INCLUDE_DIRECTORIES(${MAPNIK_INCLUDE_DIR} ${ICUUC_INCLUDE_DIR} ${LTDL_INCLUDE_DIR} ${FREETYPE2_INCLUDE_DIR})
         
         MESSAGE(STATUS "  Enabling Mapnik support")
         MESSAGE(STATUS "  Mapnik includes : ${MAPNIK_INCLUDE_DIR}")

CMakeLists.txt

@@ -30,7 +30,7 @@ INCLUDE(SourceStatus)
 #-----------------------------------------------------------------------------
 # OTB version number.  An even minor number corresponds to releases.
 SET(OTB_VERSION_MAJOR "3")
-SET(OTB_VERSION_MINOR "8")
+SET(OTB_VERSION_MINOR "9")
 SET(OTB_VERSION_PATCH "0")
 
 # Version string should not include patch level.  The major.minor is

UseOTB.cmake.in

@@ -230,7 +230,7 @@ IF(OTB_USE_MAPNIK)
         # Add compiler option
         ADD_DEFINITIONS(-DOTB_USE_MAPNIK)
 
-        INCLUDE_DIRECTORIES(${MAPNIK_INCLUDE_DIR} ${ICUUC_INCLUDE_DIR} ${LTDL_INCLUDE_DIR})
+        INCLUDE_DIRECTORIES(${MAPNIK_INCLUDE_DIR} ${ICUUC_INCLUDE_DIR} ${LTDL_INCLUDE_DIR}  ${FREETYPE2_INCLUDE_DIR})
         
 ENDIF(OTB_USE_MAPNIK)