From 500f90a4d92d7fa936a81b950d4e01a26e822d8c Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Tue, 16 Jan 2018 11:15:18 +0100
Subject: [PATCH] DOC: FAQ update for Windows compilation, minor fixes
---
Documentation/Cookbook/rst/FAQ.rst | 31 +++++++++----------
.../Cookbook/rst/Installation_Macx.txt | 1 +
.../SoftwareGuide/Latex/Installation.tex | 4 +--
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Documentation/Cookbook/rst/FAQ.rst b/Documentation/Cookbook/rst/FAQ.rst
index 39a2287c3a..490e77a34c 100644
--- a/Documentation/Cookbook/rst/FAQ.rst
+++ b/Documentation/Cookbook/rst/FAQ.rst
@@ -243,22 +243,21 @@ OFF the CMake variable OTB\_USE\_EXTERNAL\_ITK.
OTB compilation and Windows platform
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-To build OTB on Windows, we highly recommend using OSGeo4W which
-provides all the necessary dependencies.
-
-Currently it is not possible to build OTB in Debug when using the
-dependencies provided by OSGeo4W. If you want to build OTB in Debug for
-Windows, you will need to build and install manually each dependency
-needed by OTB. You should use the same compiler for all the
-dependencies, as much as possible.
-
-Therefore, we highly recommend you to use OSGeo4W shell environment to
-build OTB. You can use the 32 or 64 bit installer, since OSGeo4W
-provides all the necessary dependencies in the two cases. Please follow
-carefully the procedure provided in the Software Guide.
-
-Typically, when using the dependencies provided by OSGeo4W, compile OTB
-in Release or RelWithDebInfo mode.
+To build OTB on Windows, you should prepare an environment with the following
+tools:
+
+* Visual Studio 2015 or later
+* CMake 3.1 or later
+* OTB XDK : download a Windows binary package of OTB and use the supplied
+ uninstall script to remove OTB binaries and headers. Now, this package only
+ contains the dependencies needed to build OTB.
+
+Then, you can download OTB sources (preferably, a version compatible with your
+XDK), and compile them as a standard CMake project. More details are available
+in the SoftwareGuide.
+
+There is an other solution, using OSGeo4W distribution. However, the
+dependencies may be outdated.
Using OTB
---------
diff --git a/Documentation/Cookbook/rst/Installation_Macx.txt b/Documentation/Cookbook/rst/Installation_Macx.txt
index 961e6b1b75..f77d878dbd 100644
--- a/Documentation/Cookbook/rst/Installation_Macx.txt
+++ b/Documentation/Cookbook/rst/Installation_Macx.txt
@@ -90,6 +90,7 @@ A: You can get this error at startup running Monteverdi.app or Mapla.app. The
solution is to run in a terminal the following command:
::
+
xcode-select --install
And then try to restart Monteverdi or Mapla.
diff --git a/Documentation/SoftwareGuide/Latex/Installation.tex b/Documentation/SoftwareGuide/Latex/Installation.tex
index 6c1531dc64..ea869b7531 100644
--- a/Documentation/SoftwareGuide/Latex/Installation.tex
+++ b/Documentation/SoftwareGuide/Latex/Installation.tex
@@ -324,7 +324,7 @@ directory, which in our case is \texttt{~/OTB/install/bin/}. For example:
will launch the command line version of the \textbf{ExtractROI} application,
while:
\begin{verbatim}
-./OTB/install/bin/otbgui_ExtractROI
+~/OTB/install/bin/otbgui_ExtractROI
\end{verbatim}
will launch the graphical version.
@@ -420,7 +420,7 @@ $ make install
\hline
\textbf{OTB\_USE\_CURL} & OTBCurl & \\
\hline
-\textbf{OTB\_USE\_MUPARSER} & OTBMuParser & OTBMathParser OTBDempsterShafer OTBAppClassification OTBAppMathParser OTBAppStereo OTBAppProjection OTBAppSegmentation OTBAppClassification OTBRoadExtraction OTBRCC8 OTBCCOBIA OTBAppSegmentation OTBMeanShift OTBAppSegmentation OTBMeanShift OTBAppSegmentation \\
+\textbf{OTB\_USE\_MUPARSER} & OTBMuParser & OTBMathParser OTBDempsterShafer OTBAppClassification OTBAppMathParser OTBAppStereo OTBAppProjection OTBAppSegmentation OTBRoadExtraction OTBRCC8 OTBCCOBIA OTBMeanShift \\
\hline
\textbf{OTB\_USE\_MUPARSERX} & OTBMuParserX & OTBMathParserX OTBAppMathParserX \\
\hline
--
GitLab