From afe5b08e5836f6a7f0b095d4ca057e6129697c35 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Thu, 28 Apr 2016 18:33:22 +0200
Subject: [PATCH] PKG: ask for OTB install directory explicitly
---
SuperBuild/Packaging/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SuperBuild/Packaging/CMakeLists.txt b/SuperBuild/Packaging/CMakeLists.txt
index 704363ecdf..68710acdfc 100644
--- a/SuperBuild/Packaging/CMakeLists.txt
+++ b/SuperBuild/Packaging/CMakeLists.txt
@@ -44,6 +44,7 @@ if(OUT_OF_SOURCE_BUILD)
set(Monteverdi_SOURCE_DIR "" CACHE PATH "monteverdi source directory")
set(Monteverdi_BINARY_DIR "" CACHE PATH "monteverdi binary directory")
set(MONTEVERDI_INSTALL_DIR "" CACHE PATH "monteverdi install directory")
+ set(OTB_INSTALL_DIR "" CACHE PATH "otb install directory")
else()
set(SUPERBUILD_BINARY_DIR "" CACHE PATH "path to superbuild binary directory")
set(SUPERBUILD_INSTALL_DIR "" CACHE PATH "path to superbuild install directory")
@@ -69,6 +70,7 @@ if(WIN32 OR CMAKE_CROSSCOMPILING)
Monteverdi_SOURCE_DIR
Monteverdi_BINARY_DIR
MONTEVERDI_INSTALL_DIR
+ OTB_INSTALL_DIR
)
if(NOT DEFINED ${req} OR "${${req}}" STREQUAL "")
message(FATAL_ERROR "you must set ${req}")
@@ -140,7 +142,7 @@ if(WIN32 OR CMAKE_CROSSCOMPILING)
set(Monteverdi_SOURCE_DIR "${Monteverdi_SOURCE_DIR}")
set(Monteverdi_BINARY_DIR "${Monteverdi_BINARY_DIR}")
set(MONTEVERDI_INSTALL_DIR "${MONTEVERDI_INSTALL_DIR}")
- set(OTB_INSTALL_DIR "${OTB_MODULES_DIR}/../../../..")
+ set(OTB_INSTALL_DIR "${OTB_INSTALL_DIR}")
set(DEPENDENCIES_INSTALL_DIR "${MXE_MXEROOT}/usr/${MXE_ARCH}-w64-mingw32.shared")
set(QT_PLUGINS_DIR "${DEPENDENCIES_INSTALL_DIR}/qt/plugins")
set(QT_TRANSLATIONS_DIR "${DEPENDENCIES_INSTALL_DIR}/qt/translations")
--
GitLab