From 5a5dd26c6aadb5579f38e04b68746f462f38bfa6 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Fri, 6 Jun 2008 08:41:07 +0000
Subject: [PATCH] Corrections pour que le fichier OTBConfigure.cmake contienne
les bons chemins FLTK en fonction de l'option OTB_USE_EXTERNAL_FLTK, a la
fois pour l'arbo binary et install de l'OTB.
---
OTBConfig.cmake.in | 10 +++++-----
otbGenerateOTBConfig.cmake | 26 ++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/OTBConfig.cmake.in b/OTBConfig.cmake.in
index 6046f23955..b1468d3df6 100644
--- a/OTBConfig.cmake.in
+++ b/OTBConfig.cmake.in
@@ -74,15 +74,15 @@ SET(OTB_FLTK_FLUID_EXECUTABLE "@FLTK_FLUID_EXECUTABLE@")
SET(OTB_ITK_DIR "@ITK_DIR@")
# FLTK informations
-SET(FLTK_FLUID_EXECUTABLE "@FLUID_COMMAND@")
-#SET(FLTK_BINARY_DIR "@FLTK_BINARY_DIR@")
-SET(FLTK_LIBRARY_DIRS "@FLTK_LIBRARY_DIRS@")
+SET(FLTK_FLUID_EXECUTABLE "@OTB_FLTK_FLUID_EXECUTABLE@")
+SET(FLTK_LIBRARY_DIRS "@OTB_FLTK_LIBRARY_DIRS@")
+SET(FLTK_EXECUTABLE_DIRS "@OTB_FLTK_EXECUTABLE_DIRS@")
+SET(FLUID_COMMAND "@OTB_FLUID_COMMAND@")
SET(FLTK_LIBRARIES "@FLTK_LIBRARIES@")
SET(OPENGL_LIBRARIES "@OPENGL_LIBRARIES@")
-SET(FLTK_EXECUTABLE_DIRS "@FLTK_EXECUTABLE_DIRS@")
-SET(FLUID_COMMAND "@FLUID_COMMAND@")
SET(FLTK_PLATFORM_DEPENDENT_LIBS "@FLTK_PLATFORM_DEPENDENT_LIBS@")
+
# The OTB Visu Gui informations
SET(OTB_USE_VISU_GUI "@OTB_USE_VISU_GUI@")
SET(OTB_VISU_GUI_LIBRARIES "@OTB_VISU_GUI_LIBRARIES@")
diff --git a/otbGenerateOTBConfig.cmake b/otbGenerateOTBConfig.cmake
index 9da0d4124d..7620e18e3f 100644
--- a/otbGenerateOTBConfig.cmake
+++ b/otbGenerateOTBConfig.cmake
@@ -27,6 +27,17 @@ SET(OTB_INCLUDE_DIRS_CONFIG
${OTB_INCLUDE_DIRS_SYSTEM}
)
+# Built Configure FLTK commands and directories
+IF(OTB_USE_EXTERNAL_FLTK)
+ SET(OTB_FLTK_FLUID_EXECUTABLE ${FLTK_FLUID_EXECUTABLE})
+ELSE(OTB_USE_EXTERNAL_FLTK)
+ SET(OTB_FLTK_FLUID_EXECUTABLE ${FLUID_COMMAND})
+ENDIF(OTB_USE_EXTERNAL_FLTK)
+
+SET(OTB_FLUID_COMMAND ${FLUID_COMMAND})
+SET(OTB_FLTK_LIBRARY_DIRS ${FLTK_LIBRARY_DIRS})
+SET(OTB_FLTK_EXECUTABLE_DIRS ${FLTK_EXECUTABLE_DIRS})
+
#-----------------------------------------------------------------------------
# Configure OTBConfig.cmake for the BUILD tree.
CONFIGURE_FILE(${OTB_SOURCE_DIR}/OTBConfig.cmake.in
@@ -57,6 +68,21 @@ SET(OTB_LIBRARY_DIRS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/otb)
SET(OTB_LIBRARY_DIRS_CONFIG ${OTB_LIBRARY_DIRS_CONFIG} ${GDAL_LIBRARY_DIRS} ${ITK_LIBRARY_DIRS} ${FLTK_LIBRARY_DIRS})
+# Install Configure FLTK commands and directories
+IF(OTB_USE_EXTERNAL_FLTK)
+ SET(OTB_FLTK_FLUID_EXECUTABLE ${FLTK_FLUID_EXECUTABLE})
+ SET(OTB_FLUID_COMMAND ${FLUID_COMMAND})
+ SET(OTB_FLTK_LIBRARY_DIRS ${FLTK_LIBRARY_DIRS})
+ SET(OTB_FLTK_EXECUTABLE_DIRS ${FLTK_EXECUTABLE_DIRS})
+ELSE(OTB_USE_EXTERNAL_FLTK)
+ GET_FILENAME_COMPONENT(FLUID_FILE_NAME ${FLUID_COMMAND} NAME )
+ SET(OTB_FLUID_COMMAND ${CMAKE_INSTALL_PREFIX}/bin/${FLUID_FILE_NAME})
+ SET(OTB_FLTK_FLUID_EXECUTABLE ${OTB_FLUID_COMMAND})
+ SET(OTB_FLTK_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/lib)
+ SET(OTB_FLTK_EXECUTABLE_DIRS ${CMAKE_INSTALL_PREFIX}/bin)
+ENDIF(OTB_USE_EXTERNAL_FLTK)
+
+
#-----------------------------------------------------------------------------
# Configure OTBConfig.cmake for the INSTALL tree.
CONFIGURE_FILE(${OTB_SOURCE_DIR}/OTBConfig.cmake.in
--
GitLab