[otb] 02/14: Reorder CMake options.

Bas Couwenberg sebastic at debian.org
Mon Dec 26 02:51:04 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository otb.

commit f6d6f03c66afcb8b24e6c9a60ab4d79b44dc9fa3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Dec 25 22:26:44 2016 +0100

    Reorder CMake options.
---
 debian/rules | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1140f8a..e7e38b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,28 +35,28 @@ OTB_VERSION_FULL   = $(OTB_VERSION_MAJOR).$(OTB_VERSION_MINOR).$(OTB_VERSION_PAT
 UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 
 CMAKE_FLAGS = \
-	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DBUILD_EXAMPLES:BOOL=OFF \
+	-DBUILD_SHARED_LIBS:BOOL=ON \
+	-DBUILD_TESTING:BOOL=OFF \
 	-DCMAKE_BUILD_TYPE:STRING=Release \
-	-DOTB_INSTALL_LIBRARY_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
-	-DOTB_INSTALL_ARCHIVE_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
+	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
+	-DOTB_INSTALL_ARCHIVE_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
+	-DOTB_INSTALL_LIBRARY_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
+	-DOTB_USE_6S:BOOL=OFF \
 	-DOTB_USE_CURL:BOOL=ON \
 	-DOTB_USE_GLEW:BOOL=ON \
 	-DOTB_USE_GLFW:BOOL=ON \
 	-DOTB_USE_LIBKML:BOOL=ON \
+	-DOTB_USE_LIBSVM:BOOL=OFF \
+	-DOTB_USE_MAPNIK:BOOL=OFF \
 	-DOTB_USE_MUPARSER:BOOL=ON \
-	-DOTB_USE_QT4:BOOL=ON \
+	-DOTB_USE_MUPARSERX:BOOL=OFF \
 	-DOTB_USE_OPENCV:BOOL=OFF \
 	-DOTB_USE_OPENGL:BOOL=ON \
-	-DBUILD_SHARED_LIBS:BOOL=ON \
-	-DOTB_WRAP_PYTHON:BOOL=ON \
-	-DBUILD_EXAMPLES:BOOL=OFF \
-	-DBUILD_TESTING:BOOL=OFF \
-	-DOTB_USE_MAPNIK:BOOL=OFF \
-	-DOTB_USE_6S:BOOL=OFF \
-	-DOTB_USE_MUPARSERX:BOOL=OFF \
 	-DOTB_USE_OPENJPEG:BOOL=OFF \
-	-DOTB_USE_LIBSVM:BOOL=OFF
+	-DOTB_USE_QT4:BOOL=ON \
+	-DOTB_WRAP_PYTHON:BOOL=ON
 
 
 DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git



More information about the Pkg-grass-devel mailing list