build-system: move exportfuncs to backend-shared

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

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

update backend-shared/CMakeLists.txt to generate backend-shared lib

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>

CMakeLists.txt

@@ -312,6 +312,7 @@ if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable")
 		subsurface_mobile
 		subsurface_profile
 		subsurface_mapwidget
+		subsurface_backend_shared
 		subsurface_models_mobile
 		subsurface_corelib
 		${SUBSURFACE_LINK_LIBRARIES}
@@ -335,6 +336,7 @@ elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable")
 		subsurface_profile
 		subsurface_statistics
 		subsurface_mapwidget
+		subsurface_backend_shared
 		subsurface_models_desktop
 		subsurface_commands_desktop
 		subsurface_corelib

backend-shared/CMakeLists.txt

@@ -1,2 +1,9 @@
 # backend functionality shared between Desktop (UI) and Mobile (QML)
 
+set(BACKEND_SRCS
+	exportfuncs.cpp
+	exportfuncs.h
+)
+
+add_library(subsurface_backend_shared STATIC ${BACKEND_SRCS})
+target_link_libraries(subsurface_backend_shared ${QT_LIBRARIES})

core/CMakeLists.txt

@@ -86,8 +86,6 @@ set(SUBSURFACE_CORE_LIB_SRCS
 	errorhelper.c
 	exif.cpp
 	exif.h
-	exportfuncs.cpp
-	exportfuncs.h
 	file.c
 	file.h
 	format.cpp

desktop-widgets/divelogexportdialog.cpp

@@ -15,7 +15,7 @@
 #include "core/errorhelper.h"
 #include "core/file.h"
 #include "core/tag.h"
-#include "core/exportfuncs.h"
+#include "backend-shared/exportfuncs.h"
 #include "desktop-widgets/mainwindow.h"
 #include "desktop-widgets/divelogexportdialog.h"
 #include "desktop-widgets/diveshareexportdialog.h"

mobile-widgets/qmlmanager.cpp

@@ -45,7 +45,7 @@
 #include "core/settings/qPrefPartialPressureGas.h"
 #include "core/settings/qPrefUnit.h"
 #include "core/trip.h"
-#include "core/exportfuncs.h"
+#include "backend-shared/exportfuncs.h"
 #include "core/worldmap-save.h"
 #include "core/uploadDiveLogsDE.h"
 #include "core/uploadDiveShare.h"

packaging/ios/Subsurface-mobile.pro

@@ -31,7 +31,6 @@ SOURCES += ../../subsurface-mobile-main.cpp \
 	../../core/divesitehelpers.cpp \
 	../../core/errorhelper.c \
 	../../core/exif.cpp \
-	../../core/exportfuncs.cpp \
 	../../core/format.cpp \
 	../../core/gettextfromc.cpp \
 	../../core/metrics.cpp \
@@ -107,6 +106,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \
 	../../core/subsurface-qt/CylinderObjectHelper.cpp \
 	../../core/subsurface-qt/DiveObjectHelper.cpp \
 	../../core/subsurface-qt/DiveListNotifier.cpp \
+	../../backend-shared/exportfuncs.cpp \
 	../../mobile-widgets/qmlmanager.cpp \
 	../../mobile-widgets/qmlprefs.cpp \
 	../../qt-models/divelistmodel.cpp \
@@ -186,7 +186,6 @@ HEADERS += \
 	../../core/divelogexportlogic.h \
 	../../core/divesitehelpers.h \
 	../../core/exif.h \
-	../../core/exportfuncs.h \
 	../../core/file.h \
 	../../core/gaspressures.h \
 	../../core/gettext.h \
@@ -232,6 +231,7 @@ HEADERS += \
 	../../core/subsurface-qt/CylinderObjectHelper.h \
 	../../core/subsurface-qt/DiveObjectHelper.h \
 	../../core/subsurface-qt/DiveListNotifier.h \
+	../../backend-shared/exportfuncs.h \
 	../../mobile-widgets/qmlmanager.h \
 	../../mobile-widgets/qmlprefs.h \
 	../../map-widget/qmlmapwidgethelper.h \