Commit 3a868e44 authored by Guillaume Pasero's avatar Guillaume Pasero

Synchronize develop with 'release-5.6'

parents d24a5eb5 7e02bfb6
...@@ -227,8 +227,8 @@ In fact there is no make install target for the SuperBuild. ...@@ -227,8 +227,8 @@ In fact there is no make install target for the SuperBuild.
By default, SuperBuild will not use any of libraries installed on system. All \texttt{USE\_SYSTEM\_\textit{XXX}} are By default, SuperBuild will not use any of libraries installed on system. All \texttt{USE\_SYSTEM\_\textit{XXX}} are
are set to FALSE. This is our recommended way of using SuperBuild. You are however free to use a system library are set to FALSE. This is our recommended way of using SuperBuild. You are however free to use a system library
if you want!. You must be very much aware of dependencies of those libraries you use from system. For example, if you want!. You must be very much aware of dependencies of those libraries you use from system. For example,
if libjpeg is not used from superbuild using USE_SYSTEM_JPEG=TRUE then you should not use zlib from superbuild if libjpeg is not used from superbuild using \texttt{USE\_SYSTEM\_JPEG=TRUE} then you should not use zlib from superbuild
because zlib is a dependency of libjpeg. Here SuperBuild will not automagically set USE_SYSTEM_ZLIB=FALSE. because zlib is a dependency of libjpeg. Here SuperBuild will not automagically set \texttt{USE\_SYSTEM\_ZLIB=FALSE}.
You must do it yourself. The example of libjpeg - zlib dependency chain is so simple. You must do it yourself. The example of libjpeg - zlib dependency chain is so simple.
Imagine the same case for GDAL which depends on zlib, libjpeg, libtiff(with big tiff support), geotiff, Imagine the same case for GDAL which depends on zlib, libjpeg, libtiff(with big tiff support), geotiff,
sqlite, curl, geos, libkml, openjpeg. This is one of the reasons we recommend to use SuperBuild exclusively or not. sqlite, curl, geos, libkml, openjpeg. This is one of the reasons we recommend to use SuperBuild exclusively or not.
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
// \item allow the computation of the radiative terms by other libraries // \item allow the computation of the radiative terms by other libraries
// than 6S (such as SMAC method). // than 6S (such as SMAC method).
// \item allow the users of the OpticalCalibration application to set // \item allow the users of the OpticalCalibration application to set
// and ITK_OVERRIDE each correction parameter. // and override each correction parameter.
// \end{itemize} // \end{itemize}
// //
// Let's look at the minimal code required to use this // Let's look at the minimal code required to use this
......
...@@ -882,14 +882,16 @@ otb_test_application(NAME apTvClSampleExtraction ...@@ -882,14 +882,16 @@ otb_test_application(NAME apTvClSampleExtraction
${TEMP}/apTvClSampleExtractionOut.sqlite) ${TEMP}/apTvClSampleExtractionOut.sqlite)
#----------- TrainVectorClassifier TESTS ---------------- #----------- TrainVectorClassifier TESTS ----------------
otb_test_application(NAME apTvClTrainVectorClassifier if(OTB_USE_OPENCV)
APP TrainVectorClassifier otb_test_application(NAME apTvClTrainVectorClassifier
OPTIONS -io.vd ${INPUTDATA}/Classification/apTvClSampleExtractionOut.sqlite APP TrainVectorClassifier
-feat value_0 value_1 value_2 value_3 OPTIONS -io.vd ${INPUTDATA}/Classification/apTvClSampleExtractionOut.sqlite
-cfield class -feat value_0 value_1 value_2 value_3
-classifier rf -cfield class
-io.confmatout ${TEMP}/apTvClTrainVectorClassifierConfMat.txt -classifier rf
-io.out ${TEMP}/apTvClTrainVectorClassifierModel.rf -io.confmatout ${TEMP}/apTvClTrainVectorClassifierConfMat.txt
VALID --compare-ascii ${NOTOL} -io.out ${TEMP}/apTvClTrainVectorClassifierModel.rf
${OTBAPP_BASELINE_FILES}/apTvClTrainVectorClassifierModel.rf VALID --compare-ascii ${NOTOL}
${TEMP}/apTvClTrainVectorClassifierModel.rf) ${OTBAPP_BASELINE_FILES}/apTvClTrainVectorClassifierModel.rf
${TEMP}/apTvClTrainVectorClassifierModel.rf)
endif()
\ No newline at end of file
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