From 7751ec1c78642ffcc470ad8714a87851fd5b069d Mon Sep 17 00:00:00 2001
From: jan Iversen <jan@casacondor.com>
Date: Sat, 14 Dec 2019 23:12:26 +0100
Subject: [PATCH] build-system: move plannerShared to backend-shared

WARNING: multi directory commit, needed to secure it builds.

move the core/plannerShared.* to backend-shared.

update CMakeLists.txt to include backend-shared lib in link process.

update ios project to reflect new directory

Signed-off-by: Jan Iversen <jan@casacondor.com>
---
 backend-shared/CMakeLists.txt              | 2 ++
 {core => backend-shared}/plannershared.cpp | 0
 {core => backend-shared}/plannershared.h   | 0
 core/CMakeLists.txt                        | 2 --
 desktop-widgets/diveplanner.cpp            | 2 +-
 packaging/ios/Subsurface-mobile.pro        | 4 ++--
 subsurface-helper.cpp                      | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename {core => backend-shared}/plannershared.cpp (100%)
 rename {core => backend-shared}/plannershared.h (100%)

diff --git a/backend-shared/CMakeLists.txt b/backend-shared/CMakeLists.txt
index b6502bfdf..fdfdb1e05 100644
--- a/backend-shared/CMakeLists.txt
+++ b/backend-shared/CMakeLists.txt
@@ -3,6 +3,8 @@
 set(BACKEND_SRCS
 	exportfuncs.cpp
 	exportfuncs.h
+	plannershared.cpp
+	plannershared.h
 )
 
 add_library(subsurface_backend_shared STATIC ${BACKEND_SRCS})
diff --git a/core/plannershared.cpp b/backend-shared/plannershared.cpp
similarity index 100%
rename from core/plannershared.cpp
rename to backend-shared/plannershared.cpp
diff --git a/core/plannershared.h b/backend-shared/plannershared.h
similarity index 100%
rename from core/plannershared.h
rename to backend-shared/plannershared.h
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 017fbdeea..c8c457432 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -72,8 +72,6 @@ set(SUBSURFACE_CORE_LIB_SRCS
 	divelist.h
 	divelogexportlogic.cpp
 	divelogexportlogic.h
-	plannershared.cpp
-	plannershared.h
 	divesite-helper.cpp
 	divesite.c
 	divesite.h
diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp
index 5f769cba1..2769befe0 100644
--- a/desktop-widgets/diveplanner.cpp
+++ b/desktop-widgets/diveplanner.cpp
@@ -7,7 +7,7 @@
 #include "core/units.h"
 #include "core/settings/qPrefDivePlanner.h"
 #include "core/gettextfromc.h"
-#include "core/plannershared.h"
+#include "backend-shared/plannershared.h"
 
 #include "qt-models/cylindermodel.h"
 #include "qt-models/models.h"
diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro
index 97c939275..bfbf8e413 100644
--- a/packaging/ios/Subsurface-mobile.pro
+++ b/packaging/ios/Subsurface-mobile.pro
@@ -87,7 +87,6 @@ SOURCES += ../../subsurface-mobile-main.cpp \
 	../../core/uploadDiveShare.cpp \
 	../../core/uploadDiveLogsDE.cpp \
 	../../core/save-profiledata.c \
-	../../core/plannershared.cpp \
 	../../core/settings/qPref.cpp \
 	../../core/settings/qPrefCloudStorage.cpp \
 	../../core/settings/qPrefDisplay.cpp \
@@ -107,6 +106,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \
 	../../core/subsurface-qt/DiveObjectHelper.cpp \
 	../../core/subsurface-qt/DiveListNotifier.cpp \
 	../../backend-shared/exportfuncs.cpp \
+	../../backend-shared/plannershared.cpp \
 	../../mobile-widgets/qmlmanager.cpp \
 	../../mobile-widgets/qmlprefs.cpp \
 	../../qt-models/divelistmodel.cpp \
@@ -212,7 +212,6 @@ HEADERS += \
 	../../core/save-profiledata.h \
 	../../core/uploadDiveShare.h \
 	../../core/uploadDiveLogsDE.h \
-	../../core/plannershared.h \
 	../../core/settings/qPref.h \
 	../../core/settings/qPrefCloudStorage.h \
 	../../core/settings/qPrefDisplay.h \
@@ -232,6 +231,7 @@ HEADERS += \
 	../../core/subsurface-qt/DiveObjectHelper.h \
 	../../core/subsurface-qt/DiveListNotifier.h \
 	../../backend-shared/exportfuncs.h \
+	../../backend-shared/plannershared.h \
 	../../mobile-widgets/qmlmanager.h \
 	../../mobile-widgets/qmlprefs.h \
 	../../map-widget/qmlmapwidgethelper.h \
diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp
index a19c52a2f..136aee4d4 100644
--- a/subsurface-helper.cpp
+++ b/subsurface-helper.cpp
@@ -20,7 +20,7 @@
 #include "qt-models/messagehandlermodel.h"
 #include "profile-widget/qmlprofile.h"
 #include "core/downloadfromdcthread.h"
-#include "core/plannershared.h"
+#include "backend-shared/plannershared.h"
 #include "qt-models/diveimportedmodel.h"
 #include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h"
 #else