From 7cfd08fdafa4c5277d5beb43b784f0b0b14d5c16 Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Thu, 15 Nov 2018 14:40:21 +0100
Subject: [PATCH] BUG: make OTB_USE_QWT a dependent option of OTB_USE_QWT
---
SuperBuild/CMake/External_qwt.cmake | 6 ------
SuperBuild/CMakeLists.txt | 3 ++-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/SuperBuild/CMake/External_qwt.cmake b/SuperBuild/CMake/External_qwt.cmake
index 8d855feb8e..add117b05d 100644
--- a/SuperBuild/CMake/External_qwt.cmake
+++ b/SuperBuild/CMake/External_qwt.cmake
@@ -23,12 +23,6 @@ INCLUDE_ONCE_MACRO(QWT)
SETUP_SUPERBUILD(QWT)
# declare dependencies
-if ( NOT OTB_USE_QT )
- message( "As Qt is a dependency of Qwt, it will be activate in the "
- "project that will behave as if OTB_USE_QT is set to ON.\n"
- "To disable Qt and Qwt use OTB_USE_QWT=OFF and OTB_USE_QT=OFF.")
-endif()
-
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(QWT QT5)
set(QWT_SB_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt
index 514783bbd1..5a3e782576 100644
--- a/SuperBuild/CMakeLists.txt
+++ b/SuperBuild/CMakeLists.txt
@@ -329,7 +329,8 @@ else()
endif()
option(OTB_USE_SHARK "Enable module Shark in OTB" ON)
-option(OTB_USE_QWT "Enable module QWT in OTB" ON)
+include (CMakeDependentOption)
+CMAKE_DEPENDENT_OPTION( OTB_USE_QWT "Enable module QWT in OTB" ON "OTB_USE_QT" OFF)
option(OTB_USE_GSL "Enable module GSL in OTB" ON)
option(OTB_USE_MPI "Enable MPI in OTB" OFF)
--
GitLab