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>
This commit is contained in:
jan Iversen 2019-12-14 23:12:26 +01:00 committed by Dirk Hohndel
parent 9c52aaf043
commit 7751ec1c78
7 changed files with 6 additions and 6 deletions

View file

@ -3,6 +3,8 @@
set(BACKEND_SRCS set(BACKEND_SRCS
exportfuncs.cpp exportfuncs.cpp
exportfuncs.h exportfuncs.h
plannershared.cpp
plannershared.h
) )
add_library(subsurface_backend_shared STATIC ${BACKEND_SRCS}) add_library(subsurface_backend_shared STATIC ${BACKEND_SRCS})

View file

@ -72,8 +72,6 @@ set(SUBSURFACE_CORE_LIB_SRCS
divelist.h divelist.h
divelogexportlogic.cpp divelogexportlogic.cpp
divelogexportlogic.h divelogexportlogic.h
plannershared.cpp
plannershared.h
divesite-helper.cpp divesite-helper.cpp
divesite.c divesite.c
divesite.h divesite.h

View file

@ -7,7 +7,7 @@
#include "core/units.h" #include "core/units.h"
#include "core/settings/qPrefDivePlanner.h" #include "core/settings/qPrefDivePlanner.h"
#include "core/gettextfromc.h" #include "core/gettextfromc.h"
#include "core/plannershared.h" #include "backend-shared/plannershared.h"
#include "qt-models/cylindermodel.h" #include "qt-models/cylindermodel.h"
#include "qt-models/models.h" #include "qt-models/models.h"

View file

@ -87,7 +87,6 @@ SOURCES += ../../subsurface-mobile-main.cpp \
../../core/uploadDiveShare.cpp \ ../../core/uploadDiveShare.cpp \
../../core/uploadDiveLogsDE.cpp \ ../../core/uploadDiveLogsDE.cpp \
../../core/save-profiledata.c \ ../../core/save-profiledata.c \
../../core/plannershared.cpp \
../../core/settings/qPref.cpp \ ../../core/settings/qPref.cpp \
../../core/settings/qPrefCloudStorage.cpp \ ../../core/settings/qPrefCloudStorage.cpp \
../../core/settings/qPrefDisplay.cpp \ ../../core/settings/qPrefDisplay.cpp \
@ -107,6 +106,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \
../../core/subsurface-qt/DiveObjectHelper.cpp \ ../../core/subsurface-qt/DiveObjectHelper.cpp \
../../core/subsurface-qt/DiveListNotifier.cpp \ ../../core/subsurface-qt/DiveListNotifier.cpp \
../../backend-shared/exportfuncs.cpp \ ../../backend-shared/exportfuncs.cpp \
../../backend-shared/plannershared.cpp \
../../mobile-widgets/qmlmanager.cpp \ ../../mobile-widgets/qmlmanager.cpp \
../../mobile-widgets/qmlprefs.cpp \ ../../mobile-widgets/qmlprefs.cpp \
../../qt-models/divelistmodel.cpp \ ../../qt-models/divelistmodel.cpp \
@ -212,7 +212,6 @@ HEADERS += \
../../core/save-profiledata.h \ ../../core/save-profiledata.h \
../../core/uploadDiveShare.h \ ../../core/uploadDiveShare.h \
../../core/uploadDiveLogsDE.h \ ../../core/uploadDiveLogsDE.h \
../../core/plannershared.h \
../../core/settings/qPref.h \ ../../core/settings/qPref.h \
../../core/settings/qPrefCloudStorage.h \ ../../core/settings/qPrefCloudStorage.h \
../../core/settings/qPrefDisplay.h \ ../../core/settings/qPrefDisplay.h \
@ -232,6 +231,7 @@ HEADERS += \
../../core/subsurface-qt/DiveObjectHelper.h \ ../../core/subsurface-qt/DiveObjectHelper.h \
../../core/subsurface-qt/DiveListNotifier.h \ ../../core/subsurface-qt/DiveListNotifier.h \
../../backend-shared/exportfuncs.h \ ../../backend-shared/exportfuncs.h \
../../backend-shared/plannershared.h \
../../mobile-widgets/qmlmanager.h \ ../../mobile-widgets/qmlmanager.h \
../../mobile-widgets/qmlprefs.h \ ../../mobile-widgets/qmlprefs.h \
../../map-widget/qmlmapwidgethelper.h \ ../../map-widget/qmlmapwidgethelper.h \

View file

@ -20,7 +20,7 @@
#include "qt-models/messagehandlermodel.h" #include "qt-models/messagehandlermodel.h"
#include "profile-widget/qmlprofile.h" #include "profile-widget/qmlprofile.h"
#include "core/downloadfromdcthread.h" #include "core/downloadfromdcthread.h"
#include "core/plannershared.h" #include "backend-shared/plannershared.h"
#include "qt-models/diveimportedmodel.h" #include "qt-models/diveimportedmodel.h"
#include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h" #include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h"
#else #else