Commit b34bd6d0 authored by Guillaume Pasero's avatar Guillaume Pasero

SuperBuild: disable Qt4 in superbuild

parent e59409e9
......@@ -91,10 +91,6 @@ if(OTB_WRAP_PYTHON3)
ADD_SUPERBUILD_CMAKE_VAR(OTB PYTHON3_EXECUTABLE)
endif()
if(OTB_USE_QT4)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OTB QT4)
endif()
if(OTB_USE_QT5)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OTB QT5)
endif()
......@@ -201,7 +197,7 @@ ExternalProject_Add(OTB
-DOTB_USE_MUPARSERX:BOOL=${OTB_USE_MUPARSERX}
-DOTB_USE_OPENCV:BOOL=${OTB_USE_OPENCV}
-DOTB_USE_SHARK:BOOL=${OTB_USE_SHARK}
-DOTB_USE_QT4:BOOL=${OTB_USE_QT4}
-DOTB_USE_QT5:BOOL=${OTB_USE_QT5}
-DOTB_USE_SIFTFAST:BOOL=${OTB_USE_SIFTFAST}
-DOTB_USE_OPENGL:BOOL=${OTB_USE_OPENGL}
-DOTB_USE_GLEW:BOOL=${OTB_USE_GLEW}
......
......@@ -228,13 +228,13 @@ SB_CHECKUP_WRITE_RESULT(Ossim)
SB_CHECKUP_FIND_PACKAGE(PNG)
SB_CHECKUP_WRITE_RESULT(PNG)
# Qt4
SB_CHECKUP_FIND_PACKAGE(Qt4)
if(_SB_CHECKUP_QT4_FOUND)
set(_SB_CHECKUP_QT4_VERSION "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}")
SB_CHECKUP_SPLIT_VERSION(Qt4)
# Qt5
SB_CHECKUP_FIND_PACKAGE(Qt5)
if(_SB_CHECKUP_QT5_FOUND)
set(_SB_CHECKUP_QT5_VERSION "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}")
SB_CHECKUP_SPLIT_VERSION(Qt5)
endif()
SB_CHECKUP_WRITE_RESULT(Qt4)
SB_CHECKUP_WRITE_RESULT(Qt5)
# TinyXML
SB_CHECKUP_FIND_PACKAGE(TinyXML)
......
......@@ -285,7 +285,6 @@ option(USE_SYSTEM_OPENCV "Use a system build of OpenCV" OFF)
option(USE_SYSTEM_LIBSVM "Use a system build of libsvm" OFF)
option(USE_SYSTEM_PCRE "Use a system build of PCRE" ON)
option(USE_SYSTEM_SWIG "Use a system build of swig" ON)
option(USE_SYSTEM_QT4 "Use a system build of QT4" OFF)
option(USE_SYSTEM_QT5 "Use a system build of QT5" OFF)
option(USE_SYSTEM_QWT "Use a system build of Qwt" OFF)
option(USE_SYSTEM_GLEW "Use a system build of GLEW" OFF)
......@@ -312,7 +311,6 @@ option(OTB_USE_MAPNIK "Enable module Mapnik in OTB" OFF)
option(OTB_USE_MUPARSER "Enable module muparser in OTB" ON)
option(OTB_USE_MUPARSERX "Enable module muparserX in OTB" ON)
option(OTB_USE_OPENCV "Enable module OpenCV in OTB" ON)
option(OTB_USE_QT4 "Enable module QT4 in OTB" OFF)
option(OTB_USE_QT5 "Enable module QT5 in OTB" ON)
option(OTB_USE_SIFTFAST "Enable module Siftfast in OTB" ON)
option(OTB_USE_OPENGL "Enable module OpenGL in OTB" ON)
......
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