From ea097dae573fbd55171c90d43064acd2afefcf49 Mon Sep 17 00:00:00 2001 From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org> Date: Mon, 14 Dec 2009 17:06:04 +0800 Subject: [PATCH] COMP: fix default option for FLTK --- CMakeLists.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 44210973cd..50a201a3a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ SET(CMAKE_MODULE_PATH INCLUDE_REGULAR_EXPRESSION("^(otb|itk|vtk|vnl|vcl|vxl|f2c|netlib|ce|itpack|DICOM|meta|png|dbh|tif|jpeg|zlib).*$") SOURCE_GROUP("XML Files" REGULAR_EXPRESSION "[.]xml$") +INCLUDE(CMakeDependentOption) # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security # warnings @@ -286,13 +287,18 @@ IF(OTB_USE_VISU_GUI) #------------------------------- # FLTK Library #------------------------------- - OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." OFF) + + #OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." OFF) + FIND_PACKAGE(FLTK) - IF(FLTK_FOUND) - SET(OTB_USE_EXTERNAL_FLTK ON) - ELSE(FLTK_FOUND) - SET(OTB_USE_EXTERNAL_FLTK OFF) - ENDIF(FLTK_FOUND) + CMAKE_DEPENDENT_OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." ON + "FLTK_FOUND" OFF) + +# IF(FLTK_FOUND) +# SET(OTB_USE_EXTERNAL_FLTK ON) +# ELSE(FLTK_FOUND) +# SET(OTB_USE_EXTERNAL_FLTK OFF) +# ENDIF(FLTK_FOUND) # Option for internal/external FLTK MARK_AS_ADVANCED(OTB_USE_EXTERNAL_FLTK) -- GitLab