MRG: merge commit

CMake/ImportBoost.cmake

@@ -6,17 +6,13 @@ mark_as_advanced(OTB_USE_EXTERNAL_BOOST)
 
 if(OTB_USE_EXTERNAL_BOOST)
   # Import the package
-  find_package(Boost)
+  find_package(Boost 1.35.0)
   mark_as_advanced(Boost_DIR)
   if(Boost_FOUND)
     message(STATUS "  Found Boost version ${Boost_VERSION}")
-    if( ${Boost_MINOR_VERSION} LESS 35)
-      message(WARNING "Boost >= 1.35 is required. Disabling OTB_USE_EXTERNAL_BOOST")
-      set(OTB_USE_EXTERNAL_BOOST  OFF)
-    endif()
   else()
     message(FATAL_ERROR
-                  "Cannot build OTB project without boost library.  Please set Boost directories or set OTB_USE_EXTERNAL_BOOST to OFF to use the INTERNAL Boost version")
+                  "Cannot build OTB project without boost library (>1.35.0). Please set Boost directories or set OTB_USE_EXTERNAL_BOOST to OFF to use the INTERNAL Boost version")
   endif()
 
   # Test package completeness

CMake/UseOTB.cmake.in

@@ -89,7 +89,7 @@ endif()
 
 if(OTB_USE_EXTERNAL_LIBKML)
   find_package(LibKML REQUIRED)
-  include_directories(${LIBKML_INCLUDE_DIRS})
+  include_directories(${LIBKML_INCLUDE_DIR})
 endif()
 
 if(OTB_USE_EXTERNAL_TINYXML)

CMake/otbIncludeDirectories.cmake

@@ -97,7 +97,7 @@ endif()
 
 if(OTB_USE_EXTERNAL_LIBKML)
   set(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
-      ${LIBKML_INCLUDE_DIRS})
+      ${LIBKML_INCLUDE_DIR})
 else()
   set(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
       ${OTB_SOURCE_DIR}/Utilities/otbkml/src)
@@ -296,7 +296,7 @@ endif()
 #For LibKML header file
 if(OTB_USE_EXTERNAL_LIBKML)
         set(OTB_INCLUDE_ABSOLUE_DIRS ${OTB_INCLUDE_ABSOLUE_DIRS}
-                ${LIBKML_INCLUDE_DIRS})
+                ${LIBKML_INCLUDE_DIR})
 else()
         set(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
                 Utilities/otbkml)