diff --git a/SuperBuild/CMake/External_otb.cmake b/SuperBuild/CMake/External_otb.cmake index fed28a3bd54854b54b04a760a948233893716a29..80876e74daadce0fb7f5aecc285860cf366fd725 100644 --- a/SuperBuild/CMake/External_otb.cmake +++ b/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} diff --git a/SuperBuild/CMake/External_package.cmake b/SuperBuild/CMake/External_package.cmake index 09732f9793f4b12324fe4a8006f588c8df68b759..7194c131a898355b0cefe6271dec843dc61383af 100644 --- a/SuperBuild/CMake/External_package.cmake +++ b/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} diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index 8af36f8da12868b2335ccf1a755cc020be22dee1..384421f4a93ef612de5b081a92c55f48579e9999 100644 --- a/SuperBuild/CMakeLists.txt +++ b/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) diff --git a/SuperBuild/Packaging/CMakeLists.txt b/SuperBuild/Packaging/CMakeLists.txt index c017994eac00924a2d07acbd3b6fca6898b2aee0..79cb2cd1ef9751ff6b9d3ce3c83aef8914e59d7d 100644 --- a/SuperBuild/Packaging/CMakeLists.txt +++ b/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})