blob: 4221ce9f82cd870b7ddc77e2e203fef5c034a43c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
diff -urN LogbookKonni_pi-1.4.22.0.orig/cmake/PluginInstall.cmake LogbookKonni_pi-1.4.22.0/cmake/PluginInstall.cmake
--- LogbookKonni_pi-1.4.22.0.orig/cmake/PluginInstall.cmake 2021-10-30 07:35:43.000000000 -1000
+++ LogbookKonni_pi-1.4.22.0/cmake/PluginInstall.cmake 2021-11-29 22:31:48.755156001 -1000
@@ -6,7 +6,7 @@
# Installation items and layout.
# ~~~
-include(Metadata)
+#include(Metadata)
if (APPLE)
install(
diff -urN LogbookKonni_pi-1.4.22.0.orig/cmake/Targets.cmake LogbookKonni_pi-1.4.22.0/cmake/Targets.cmake
--- LogbookKonni_pi-1.4.22.0.orig/cmake/Targets.cmake 2021-10-30 07:35:43.000000000 -1000
+++ LogbookKonni_pi-1.4.22.0/cmake/Targets.cmake 2021-11-29 22:31:48.756156018 -1000
@@ -8,7 +8,7 @@
return()
endif ()
-include(Metadata)
+#include(Metadata)
if (UNIX AND NOT APPLE AND NOT QT_ANDROID)
set(_LINUX ON)
diff -urN LogbookKonni_pi-1.4.22.0.orig/CMakeLists.txt LogbookKonni_pi-1.4.22.0/CMakeLists.txt
--- LogbookKonni_pi-1.4.22.0.orig/CMakeLists.txt 2021-10-30 07:35:43.000000000 -1000
+++ LogbookKonni_pi-1.4.22.0/CMakeLists.txt 2021-11-29 22:42:03.398496368 -1000
@@ -27,6 +27,7 @@
endif ()
message(STATUS "Cmake version: ${CMAKE_VERSION}.")
+set(BUILD_TYPE "tarball")
# -------- Build setup (mostly in PluginCompiler) --------
#
@@ -57,6 +58,7 @@
option(PLUGIN_USE_SVG "Use SVG graphics" ON)
+
include(PluginOptions)
#
@@ -135,9 +137,10 @@
create_targets(
${PROJECT_SOURCE_DIR}/flatpak/org.opencpn.OpenCPN.Plugin.logbook.yaml
)
-if ("${BUILD_TYPE}" STREQUAL "")
- return ()
-endif ()
+#if ("${BUILD_TYPE}" STREQUAL "")
+# return ()
+#endif ()
+include(PluginLibs)
if (NOT ${BUILD_TYPE} STREQUAL "flatpak")
# Build package as required (flatpak already dealt with).
|
