[PATCH 2/2] Move 'planner' qmake option to subsurface-configure
Alberto Corona
albcoron at gmail.com
Thu Mar 6 18:49:23 PST 2014
Move the planner enabling option with the rest of subsurface
configuration options
Signed-off-by: Alberto Corona <albcoron at gmail.com>
---
subsurface-configure.pri | 5 +++++
subsurface.pro | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/subsurface-configure.pri b/subsurface-configure.pri
index bcf8ef1..257aee7 100644
--- a/subsurface-configure.pri
+++ b/subsurface-configure.pri
@@ -148,6 +148,11 @@ win32 {
DEFINES -= UNICODE
}
+# enable or disable the dive planner
+planner {
+ DEFINES += ENABLE_PLANNER
+}
+
# Optional Marble
no-marble {
DEFINES += NO_MARBLE
diff --git a/subsurface.pro b/subsurface.pro
index e664f6a..38b6b96 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -234,10 +234,5 @@ QMAKE_INFO_PLIST = packaging/macosx/Info.plist.in
OTHER_FILES += $$DESKTOPFILE $$ICON $$MANPAGE $$XSLT_FILES $$DOC_FILES $$MARBLEDIR \
$$QMAKE_INFO_PLIST
-# enable or disable the dive planner
-planner {
- DEFINES += ENABLE_PLANNER
-}
-
include(subsurface-gen-version.pri)
include(subsurface-install.pri)
--
1.9.0
More information about the subsurface
mailing list