SuperBuild: avoid twisted togic in activating monteverdi (mantis-1160)

SuperBuild/CMake/External_otb.cmake

@@ -116,7 +116,7 @@ ADD_SUPERBUILD_CMAKE_VAR(OTB Boost_LIBRARY_DIR)
 if(MSVC)
   ADD_SUPERBUILD_CMAKE_VAR(OTB JPEG_LIBRARY)
 endif()
-
+  
 # forward compilation flags
 set(OTB_SB_C_FLAGS "${SB_PRIOR_INCLUDE_FLAGS} ${CMAKE_C_FLAGS} ")
 set(OTB_SB_CXX_FLAGS "${SB_PRIOR_INCLUDE_FLAGS} ${CMAKE_CXX_FLAGS}")
@@ -171,8 +171,6 @@ ExternalProject_Add(OTB
   -DOTB_USE_GLFW:BOOL=${OTB_USE_GLFW}
   -DOTB_USE_GLUT:BOOL=${OTB_USE_GLUT}
   -DOTB_USE_QWT:BOOL=${OTB_USE_QWT}
-  -DModule_OTBMapla:BOOL=${ENABLE_MONTEVERDI}
-  -DModule_OTBMonteverdi:BOOL=${ENABLE_MONTEVERDI}
   -DOTB_WRAP_PYTHON:BOOL=${OTB_WRAP_PYTHON}
   -DOTB_WRAP_JAVA:BOOL=${OTB_WRAP_JAVA}
   ${OTB_SB_CONFIG}

SuperBuild/CMake/External_package.cmake

@@ -22,10 +22,6 @@ 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")
@@ -68,8 +64,7 @@ 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 OTB
-    ${PACKAGE_OTB_configure_EXTRA_DEPENDS})
+    DEPENDS PACKAGE_TOOLS OTB)
 
   add_custom_target(PACKAGE-OTB-build
     COMMAND ${CMAKE_COMMAND}

SuperBuild/CMakeLists.txt

@@ -52,7 +52,6 @@ mark_as_advanced(DOWNLOAD_LOCATION)
 # General options
 option(ENABLE_OTB_LARGE_INPUTS " Use the OTB-LargeInputs for testing" OFF)
 option(BUILD_EXAMPLES " Build the OTB Examples directory" OFF)
-option(ENABLE_MONTEVERDI " Build Monteverdi on top of OTB" OFF)
 
 if(EXISTS "${CMAKE_SOURCE_DIR}/../CMakeLists.txt")
   file(STRINGS "${CMAKE_SOURCE_DIR}/../CMakeLists.txt" _CONTENT_CMAKELIST
@@ -239,9 +238,11 @@ option(OTB_USE_GLFW "Enable module GLFW in OTB" OFF)
 option(OTB_USE_GLUT "Enable module GLUT in OTB" OFF)
 option(OTB_USE_QWT "Enable module QWT in OTB" OFF)
 
-set(OTB_USE_OPENGL ${ENABLE_MONTEVERDI})
-set(OTB_USE_GLEW ${ENABLE_MONTEVERDI})
-set(OTB_USE_QWT ${ENABLE_MONTEVERDI})
+#Problem: below cmake setting will fail!
+#-DOTB_USE_OPENGL=ON -DOTB_USE_GLEW=ON -DOTB_USE_QWT=ON
+#This is because ENABLE_MONTEVERDI is OFF by default
+# This brings a lot of twisted logic. so taking out this option
+
 
 # set OTB_DATA_ROOT to run test
 find_path(OTB_DATA_ROOT README-OTB-Data PATHS $ENV{OTB_DATA_ROOT} ${OTB-SuperBuild_SOURCE_DIR}/../../OTB-Data)

SuperBuild/Packaging/CMakeLists.txt

@@ -57,7 +57,6 @@ if(OUT_OF_SOURCE_BUILD)
   else()
     set(SUPERBUILD_BINARY_DIR "" CACHE PATH "path to superbuild binary directory")
     set(SUPERBUILD_INSTALL_DIR "" CACHE PATH "path to superbuild install directory")
-    option(ENABLE_MONTEVERDI "enable monteverdi" ON)
     set(DOWNLOAD_LOCATION "" CACHE PATH "path to superbuild binary directory")
   endif()
 else(OUT_OF_SOURCE_BUILD)
@@ -75,8 +74,6 @@ else(OUT_OF_SOURCE_BUILD)
   #endif()
 endif(OUT_OF_SOURCE_BUILD)
 
-
-
 if(WIN32)
   set(ZIP_EXE_NAMES 7z 7za)
   find_program(ZIP_EXECUTABLE NAMES ${ZIP_EXE_NAMES})