ci: fix Swift package build regression

axxel · Dec 31, 2024 · 5a7ae44 · 5a7ae44
1 parent 0bb732b
commit 5a7ae44
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/Package.swift b/Package.swift
@@ -15,7 +15,7 @@ let package = Package(
         .target(
             name: "ZXingCppCore",
             path: "core/src",
-            exclude: ["libzint"],
+            exclude: ["libzint", "ZXingC.cpp", "ZXingCpp.cpp"],
             publicHeadersPath: ".",
             cxxSettings: [
                 .define("ZXING_READERS")

diff --git a/core/src/ZXingC.cpp b/core/src/ZXingC.cpp
@@ -7,7 +7,12 @@
 #include "ZXingC.h"
 
 #include "ZXingCpp.h"
+
+#if __has_include("Version.h")
 #include "Version.h"
+#else // this is mainly a workaround for a missing autogenerated Version.h in the XCode/CocoaPods corner
+#define ZXING_VERSION_STR "undefined"
+#endif
 
 #include <cstdlib>
 #include <exception>

diff --git a/core/src/ZXingCpp.cpp b/core/src/ZXingCpp.cpp
@@ -5,7 +5,11 @@
 
 #include "ZXingCpp.h"
 
+#if __has_include("Version.h")
 #include "Version.h"
+#else // this is mainly a workaround for a missing autogenerated Version.h in the XCode/CocoaPods corner
+#define ZXING_VERSION_STR "undefined"
+#endif
 
 namespace ZXing {