Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
3a868e44
Commit
3a868e44
authored
Jul 13, 2016
by
Guillaume Pasero
Browse files
Options
Browse Files
Download
Plain Diff
Synchronize develop with 'release-5.6'
parents
d24a5eb5
7e02bfb6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
14 deletions
+16
-14
Documentation/SoftwareGuide/Latex/Installation.tex
Documentation/SoftwareGuide/Latex/Installation.tex
+2
-2
Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
+1
-1
Modules/Applications/AppClassification/test/CMakeLists.txt
Modules/Applications/AppClassification/test/CMakeLists.txt
+13
-11
No files found.
Documentation/SoftwareGuide/Latex/Installation.tex
View file @
3a868e44
...
...
@@ -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
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 libjpeg is not used from superbuild using 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.
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
\texttt
{
USE
\
_
SYSTEM
\
_
ZLIB
=
FALSE
}
.
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,
sqlite, curl, geos, libkml, openjpeg. This is one of the reasons we recommend to use SuperBuild exclusively or not.
...
...
Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
View file @
3a868e44
...
...
@@ -52,7 +52,7 @@
// \item allow the computation of the radiative terms by other libraries
// than 6S (such as SMAC method).
// \item allow the users of the OpticalCalibration application to set
// and
ITK_OVERRIDE
each correction parameter.
// and
override
each correction parameter.
// \end{itemize}
//
// Let's look at the minimal code required to use this
...
...
Modules/Applications/AppClassification/test/CMakeLists.txt
View file @
3a868e44
...
...
@@ -882,7 +882,8 @@ otb_test_application(NAME apTvClSampleExtraction
${
TEMP
}
/apTvClSampleExtractionOut.sqlite
)
#----------- TrainVectorClassifier TESTS ----------------
otb_test_application
(
NAME apTvClTrainVectorClassifier
if
(
OTB_USE_OPENCV
)
otb_test_application
(
NAME apTvClTrainVectorClassifier
APP TrainVectorClassifier
OPTIONS -io.vd
${
INPUTDATA
}
/Classification/apTvClSampleExtractionOut.sqlite
-feat value_0 value_1 value_2 value_3
...
...
@@ -893,3 +894,4 @@ otb_test_application(NAME apTvClTrainVectorClassifier
VALID --compare-ascii
${
NOTOL
}
${
OTBAPP_BASELINE_FILES
}
/apTvClTrainVectorClassifierModel.rf
${
TEMP
}
/apTvClTrainVectorClassifierModel.rf
)
endif
()
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment