Merge branch 'softwareguide_make' into 'develop'

Remove LARGEINPUT dependency of SoftwareGuide build

See merge request orfeotoolbox/otb!269

Documentation/SoftwareGuide/CMakeLists.txt

@@ -59,14 +59,8 @@ set(OTB_VERSION_STRING_FULL "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VER
 # Configure the default OTB_DATA_ROOT for the location of OTB Data.
 FIND_PATH(OTB_DATA_ROOT README-OTB-Data PATHS $ENV{OTB_DATA_ROOT} ${OTB_SOURCE_DIR}/../OTB-Data)
 
-FIND_PATH(OTB_DATA_LARGEINPUT_ROOT OTBData.readme PATHS $ENV{OTB_DATA_LARGEINPUT_ROOT})
-
-IF( NOT OTB_DATA_LARGEINPUT_ROOT )
-  MESSAGE(FATAL_ERROR "Large input directory is not set and is mandatory to build the Software Guide.")
-ENDIF( NOT OTB_DATA_LARGEINPUT_ROOT )
-
 # OTB_DATA_PATHS is searched recursively.. you need not enter sub-directories
-SET(OTB_DATA_PATHS "${OTB_DATA_ROOT}/Examples::${OTB_DATA_ROOT}/Input::${OTB_DATA_LARGEINPUT_ROOT}" CACHE STRING "Where the OTB data is. Enter a double colon separated list.")
+SET(OTB_DATA_PATHS "${OTB_DATA_ROOT}/Examples::${OTB_DATA_ROOT}/Input" CACHE STRING "Where the OTB data is. Enter a double colon separated list.")
 
 #
 # Rebuild the Software Guide figures or not ?

Examples/Hyperspectral/test/CMakeLists.txt

@@ -30,7 +30,7 @@ otb_add_test(NAME siTvHyperspectralExampleTest COMMAND ${OTB_TEST_DRIVER}
     ${BASELINE}/siTvHyperspectralUnmixingExampleTestBand3.png
     ${TEMP}/siTvHyperspectralUnmixingExampleTestBand3.png
   Execute $<TARGET_FILE:HyperspectralUnmixingExample>
-    LARGEINPUT{AVIRIS/Indian_pines_corrected.tif}
+    ${INPUTDATA}/AVIRIS/Indian_pines_corrected.tif
     ${TEMP}/siTvHyperspectralUnmixingExampleTest.tif
     ${TEMP}/siTvHyperspectralUnmixingExampleTestBand1.png
     ${TEMP}/siTvHyperspectralUnmixingExampleTestBand2.png