From e978dba796038a543fd76073ad4f9fd5be4e2ca5 Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Thu, 4 Mar 2010 21:44:23 +0800
Subject: [PATCH] COMP: fix fltk option to appear
---
CMakeLists.txt | 16 ++++++++--------
Examples/BasicFilters/HillShadingExample.cxx | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 850d710b18..fb456857f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -265,10 +265,10 @@ IF(OTB_USE_VISU_GUI)
FIND_PACKAGE(OpenGL)
IF( NOT OPENGL_FOUND )
- MESSAGE(FATAL_ERROR "Impossible to find OpenGL on your system.\nCannot build OTB Visu module without OpenGL library.\nInstall OpenGL on your system OR set OTB_USE_VISU to OFF to disable OTB Visu module generation !")
- ENDIF( NOT OPENGL_FOUND )
+ MESSAGE(FATAL_ERROR "Impossible to find OpenGL on your system.\nCannot build OTB Visu module without OpenGL library.\nInstall OpenGL on your system OR set OTB_USE_VISU_GUI to OFF to disable OTB Visu module generation !")
+ ENDIF( NOT OPENGL_FOUND )
IF( NOT OPENGL_GLU_FOUND )
- MESSAGE(FATAL_ERROR "Impossible to find GLU library on your system.\nCannot build OTB Visu module without GLU library.\nInstall GLU library on your system OR set OTB_USE_VISU to OFF to disable OTB Visu module generation !")
+ MESSAGE(FATAL_ERROR "Impossible to find GLU library on your system.\nCannot build OTB Visu module without GLU library.\nInstall GLU library on your system OR set OTB_USE_VISU_GUI to OFF to disable OTB Visu module generation !")
ENDIF( NOT OPENGL_GLU_FOUND )
IF(OPENGL_INCLUDE_DIR)
@@ -290,11 +290,11 @@ IF(OTB_USE_VISU_GUI)
FIND_PACKAGE(FLTK)
# If an external fltk is found, do not provide the internal fltk choice
- IF(NOT FLTK_FOUND)
- OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." OFF)
- ELSE(NOT FLTK_FOUND)
- SET(OTB_USE_EXTERNAL_FLTK ON)
- ENDIF(NOT FLTK_FOUND)
+ IF(FLTK_FOUND)
+ OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." ON)
+ ELSE(FLTK_FOUND)
+ OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." OFF)
+ ENDIF(FLTK_FOUND)
# IF(FLTK_FOUND)
# SET(OTB_USE_EXTERNAL_FLTK ON)
diff --git a/Examples/BasicFilters/HillShadingExample.cxx b/Examples/BasicFilters/HillShadingExample.cxx
index 3a706fc076..a4be0ad195 100644
--- a/Examples/BasicFilters/HillShadingExample.cxx
+++ b/Examples/BasicFilters/HillShadingExample.cxx
@@ -154,7 +154,7 @@ int main(int argc, char * argv[])
//
// After generating the dem image as in the DEMToImageGenerator example, you can declare
// the hill shading mechanism. The hill shading is implemented as a functor doing some
- // operations in its neighorhood. This functor is used in the
+ // operations in its neighborhood. This functor is used in the
// \doxygen{otb}{UnaryFunctorNeighborhoodImageFilter} that will be in charge of processing
// the whole image.
//
--
GitLab