Commit 094d9ef4 authored by Julien Michel's avatar Julien Michel
Browse files

Tentative correction FIND_PACKAGE

parent 312c5af9
......@@ -122,7 +122,8 @@ IF(OTB_USE_VISU_GUI)
FIND_PACKAGE(FLTK)
IF(FLTK_FOUND)
INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIRS})
LINK_DIRECTORIES(${FLTK_LIBRARY_DIRS})
ELSE(FLTK_FOUND)
MESSAGE(FATAL_ERROR
"Cannot build OTB project without FLTK. Please set FLTK_DIR or set OTB_USE_VISU to OFF.")
......
......@@ -64,3 +64,4 @@ SET(OTB_USE_SYSTEM_VXL "@OTB_USE_SYSTEM_VXL@")
SET(OTB_VXL_DIR "@OTB_VXL_DIR@")
SET(OTB_FLTK_FLUID_EXECUTABLE "@FLTK_FLUID_EXECUTABLE@")
SET(OTB_ITK_DIR "@ITK_DIR@")
......@@ -22,6 +22,7 @@ INCLUDE_DIRECTORIES(BEFORE ${OTB_INCLUDE_DIRS})
# Add link directories needed to use OTB.
LINK_DIRECTORIES(${OTB_LIBRARY_DIRS})
MESSAGE(${OTB_LIBRARY_DIRS})
# Load settings fro the system VXL with which OTB was built, if any.
IF(OTB_USE_SYSTEM_VXL)
......@@ -68,3 +69,8 @@ IF(OTB_USE_SYSTEM_VXL)
ENDIF(OTB_USE_SYSTEM_VXL)
SET(FLTK_FLUID_EXECUTABLE ${OTB_FLTK_FLUID_EXECUTABLE})
#WHERE TO FIND ITK
IF(OTB_USE_EXTERNAL_ITK)
INCLUDE(${OTB_ITK_DIR}/ITKConfig.cmake)
INCLUDE(${ITK_USE_FILE})
ENDIF(OTB_USE_EXTERNAL_ITK)
......@@ -18,7 +18,7 @@ SET(OTB_BUILD_SETTINGS_FILE ${OTB_BINARY_DIR}/OTBBuildSettings.cmake)
SET(OTB_LIBRARY_DIRS_CONFIG ${OTB_LIBRARY_PATH})
SET(OTB_LIBRARY_DIRS_CONFIG ${OTB_LIBRARY_DIRS_CONFIG} ${GDAL_LIBRARY_DIRS} ${ITK_LIBRARY_DIRS} )
SET(OTB_LIBRARY_DIRS_CONFIG ${OTB_LIBRARY_DIRS_CONFIG} ${GDAL_LIBRARY_DIRS} ${ITK_LIBRARY_DIRS} ${FLTK_LIBRARY_DIRS})
# Determine the include directories needed.
SET(OTB_INCLUDE_DIRS_CONFIG
......
......@@ -66,7 +66,7 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX)
SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX} )
SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
${GDAL_INCLUDE_DIRS} )
${GDAL_INCLUDE_DIRS} ${FLTK_INCLUDE_DIRS} )
IF(OTB_USE_EXTERNAL_ITK)
SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
......@@ -104,7 +104,7 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
)
SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
${GDAL_INCLUDE_DIRS} )
${GDAL_INCLUDE_DIRS} ${FLTK_INCLUDE_DIRS})
IF(OTB_USE_EXTERNAL_ITK)
SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
......
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