Commit 699571de authored by Guillaume Pasero's avatar Guillaume Pasero

SuperBuild: integrate visu to otb superbuild

parent cceb306b
......@@ -61,6 +61,17 @@ if(OTB_USE_QT4)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(${proj} QT4)
endif()
if(OTB_USE_GLEW)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(${proj} GLEW)
endif()
if(OTB_USE_GLFW)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(${proj} GLFW)
endif()
if(OTB_USE_GLUT)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(${proj} GLUT)
endif()
INCLUDE_SUPERBUILD_DEPENDENCIES(${${proj}_DEPENDENCIES})
# set proj back to its original value
......@@ -114,6 +125,18 @@ endif()
ADD_SUPERBUILD_CMAKE_VAR(SWIG_EXECUTABLE)
if(OTB_USE_GLEW)
ADD_SUPERBUILD_CMAKE_VAR(GLEW_INCLUDE_DIR)
ADD_SUPERBUILD_CMAKE_VAR(GLEW_LIBRARY)
endif()
if(OTB_USE_GLFW)
ADD_SUPERBUILD_CMAKE_VAR(GLFW_INCLUDE_DIR)
ADD_SUPERBUILD_CMAKE_VAR(GLFW_LIBRARY)
endif()
if(OTB_USE_GLUT)
ADD_SUPERBUILD_CMAKE_VAR(GLUT_INCLUDE_DIR)
ADD_SUPERBUILD_CMAKE_VAR(GLUT_LIBRARY)
endif()
if(SUPERBUILD_IN_OTB_TREE)
set(OTB_HG_SOURCES DOWNLOAD_COMMAND "")
......@@ -183,6 +206,12 @@ ExternalProject_Add(${proj}
CMAKE_COMMAND ${OTB_SB_CMAKE_COMMAND}
)
# detect OTB version number
if (SUPERBUILD_OTB_VERSION)
set(_SB_${proj}_DIR ${SB_INSTALL_PREFIX}/lib/cmake/OTB-${SUPERBUILD_OTB_VERSION})
else()
set(_SB_${proj}_DIR ${SB_INSTALL_PREFIX})
endif()
endif()
......@@ -27,7 +27,7 @@ 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)
# check if superbuild is in OTB source or in stand-alone mode
set(SUPERBUILD_IN_OTB_TREE OFF)
......@@ -36,6 +36,9 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/../CMakeLists.txt")
REGEX "project\\\(OTB\\\)")
if(NOT "${_CONTENT_CMAKELIST}" STREQUAL "")
set(SUPERBUILD_IN_OTB_TREE ON)
# parse the version number
# TODO
set(SUPERBUILD_OTB_VERSION "5.3.0")
endif()
endif()
message(STATUS "Check if superbuild is in OTB tree : ${SUPERBUILD_IN_OTB_TREE}")
......@@ -125,7 +128,11 @@ SETUP_SYSTEM_LIBRARY(PROJECT PCRE DEFAULT ON)
SETUP_SYSTEM_LIBRARY(PROJECT SWIG DEFAULT ON)
SETUP_SYSTEM_LIBRARY(PROJECT QT4 DEFAULT ON)
SETUP_SYSTEM_LIBRARY(PROJECT QWT DEFAULT ON)
SETUP_SYSTEM_LIBRARY(PROJECT GLEW DEFAULT ON)
SETUP_SYSTEM_LIBRARY(PROJECT GLFW DEFAULT ON)
SETUP_SYSTEM_LIBRARY(PROJECT GLUT DEFAULT ON)
# Call OTB
option(OTB_USE_6S "Enable module 6S in OTB" ON)
......@@ -139,6 +146,15 @@ option(OTB_USE_OPENCV "Enable module OpenCV in OTB" ON)
option(OTB_USE_OPENJPEG "Enable module openjpeg in OTB" OFF)
option(OTB_USE_QT4 "Enable module QT4 in OTB" ON)
option(OTB_USE_SIFTFAST "Enable module Siftfast in OTB" ON)
option(OTB_USE_OPENGL "Enable module OpenGL in OTB" OFF)
option(OTB_USE_GLEW "Enable module GLEW in OTB" OFF)
option(OTB_USE_GLFW "Enable module GLFW in OTB" OFF)
option(OTB_USE_GLUT "Enable module GLUT in OTB" OFF)
if(${ENABLE_MONTEVERDI})
set(OTB_USE_OPENGL ON)
set(OTB_USE_GLEW ON)
endif()
# 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)
......@@ -177,7 +193,11 @@ foreach(lib ${_SYSTEM_CHECKUP_CONTENT})
endforeach()
# Main external projet : dependencies are included (if needed) in each external project
include(External_otb)
if(ENABLE_MONTEVERDI)
include(External_mvd)
else()
include(External_otb)
endif()
#check compiler is gnu?
if(UNIX AND NOT APPLE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment