SuperBuild: FREETYPE_INCLUDE_DIR -> FREETYPE_INCLUDE_DIRS/freetype2

SuperBuild/CMake/External_freetype.cmake

@@ -22,7 +22,7 @@ else()
     CMAKE_COMMAND ${SB_CMAKE_COMMAND}
     )
 
-  set(_SB_FREETYPE_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
+  set(_SB_FREETYPE_INCLUDE_DIRS ${SB_INSTALL_PREFIX}/include/freetype2)
   if(WIN32)
     set(_SB_FREETYPE_LIBRARY ${SB_INSTALL_PREFIX}/lib/freetype.lib)
   elseif(UNIX)

SuperBuild/CMake/External_ossim.cmake

@@ -27,7 +27,7 @@ else()
   ADD_SUPERBUILD_CMAKE_VAR(OSSIM JPEG_LIBRARY)
   ADD_SUPERBUILD_CMAKE_VAR(OSSIM OPENTHREADS_INCLUDE_DIR)
   ADD_SUPERBUILD_CMAKE_VAR(OSSIM OPENTHREADS_LIBRARY)
-  ADD_SUPERBUILD_CMAKE_VAR(OSSIM FREETYPE_INCLUDE_DIR)
+  ADD_SUPERBUILD_CMAKE_VAR(OSSIM FREETYPE_INCLUDE_DIRS)
   ADD_SUPERBUILD_CMAKE_VAR(OSSIM FREETYPE_LIBRARY)
 
   set(OSSIM_CXX_FLAGS  -D__STDC_CONSTANT_MACROS)

SuperBuild/CMake/External_package.cmake

@@ -22,6 +22,10 @@ endif()
 set(PACKAGE_NAME OTB)
 set(PACKAGE_LONG_NAME OrfeoToolBox)
 
+if(ENABLE_MONTEVERDI)
+  set(PACKAGE_OTB_configure_EXTRA_DEPENDS MVD)
+endif()
+
 if(UNIX)
   if(APPLE)
     set(PACKAGE_PLATFORM_NAME "Darwin")
@@ -64,7 +68,8 @@ file(WRITE "${CMAKE_BINARY_DIR}/PACKAGE-OTB/src/PACKAGE-OTB/CMakeLists.txt"
     COMMAND ${CMAKE_COMMAND}
     "${CMAKE_BINARY_DIR}/PACKAGE-OTB/src/PACKAGE-OTB"
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/PACKAGE-OTB/build"
-    DEPENDS PACKAGE_TOOLS)
+    DEPENDS PACKAGE_TOOLS OTB
+    ${PACKAGE_OTB_configure_EXTRA_DEPENDS})
 
   add_custom_target(PACKAGE-OTB-build
     COMMAND ${CMAKE_COMMAND}

SuperBuild/CMakeLists.txt

@@ -216,7 +216,8 @@ endif()
 option(OTB_WRAP_PYTHON "Enable python wrappers for OTB applications (requires SWIG)" OFF)
 option(OTB_WRAP_JAVA "Enable java wrappers for OTB applications (requires SWIG)" OFF)
 
-option(GENERATE_XDK "Generate an .run with all dependencies. supported only on Linux" OFF)
+option(GENERATE_PACKAGE "Generate a portable .run package of OTB (only Unix)." OFF)
+option(GENERATE_XDK "Generate an XDK. This files provides all headers and libraries to build and or develop OTB (only Unix)." OFF)
 
 configure_file(${CMAKE_SOURCE_DIR}/CMake/CTestCustom.cmake.in
   ${CMAKE_BINARY_DIR}/CTestCustom.cmake @ONLY)
@@ -248,12 +249,11 @@ else()
   include(External_otb)
 endif()
 
-#check compiler is gnu?
-if(UNIX)
-  if(GENERATE_XDK)
-    include(GenerateXDK)
-  endif()
-
-  include(External_package)
-
-endif(UNIX)
+if(GENERATE_PACKAGE)
+  if(UNIX)
+    if(GENERATE_XDK)
+      include(GenerateXDK)
+    endif()
+    include(External_package)
+  endif(UNIX)
+endif()
\ No newline at end of file