Commit 03123fed authored by Romain Garrigues's avatar Romain Garrigues
Browse files

Suppression de l'option OTB_OSSIM_COMPILATION

OSSIM est maintenant tout le temps compilé dans l'arborescence OTB
parent 5eb1177f
......@@ -10,10 +10,7 @@ MAKE_DIRECTORY(${OTBTesting_BINARY_DIR}/Temporary)
IF(OTB_BINARY_DIR)
# We are building inside the tree.
SUBDIRS(Code Fa)
IF(OTB_OSSIM_COMPILATION)
SUBDIRS(Utilities)
ENDIF(OTB_OSSIM_COMPILATION)
SUBDIRS(Code Fa Utilities)
ELSE(OTB_BINARY_DIR)
# We are building as a stand-alone project.
SET(LIBRARY_OUTPUT_PATH ${OTBTesting_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
......@@ -38,10 +35,7 @@ ELSE(OTB_BINARY_DIR)
FIND_PACKAGE(OTB)
IF(OTB_FOUND)
INCLUDE(${OTB_USE_FILE})
SUBDIRS(Code Fa)
IF(OTB_OSSIM_COMPILATION)
SUBDIRS(Utilities)
ENDIF(OTB_OSSIM_COMPILATION)
SUBDIRS(Code Fa Utilities)
ELSE(OTB_FOUND)
MESSAGE("OTB not found. Please set OTB_DIR")
ENDIF(OTB_FOUND)
......
......@@ -4,14 +4,7 @@ IF(NOT OTB_USE_EXTERNAL_ITK)
SUBDIRS( ITK )
ENDIF(NOT OTB_USE_EXTERNAL_ITK)
SUBDIRS(BGL otbsvm dxflib InsightJournal)
OPTION(OTB_OSSIM_COMPILATION "EXPERIMENTAL: Compile OSSIM library embedded within OTB" OFF)
MARK_AS_ADVANCED(OTB_OSSIM_COMPILATION)
IF(OTB_OSSIM_COMPILATION)
SUBDIRS(OSSIM)
ENDIF(OTB_OSSIM_COMPILATION)
SUBDIRS(BGL otbsvm dxflib InsightJournal OSSIM)
IF(BUILD_TESTING)
SUBDIRS( Dart )
......
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