From d22001283a49ad723da0023039c904dc6db7c5a0 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Tue, 2 Oct 2018 21:14:45 +0200
Subject: Fix bundle for non system libraries

---
 src/Conf.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/Conf.cpp')

diff --git a/src/Conf.cpp b/src/Conf.cpp
index 365cf38..fa92bf5 100644
--- a/src/Conf.cpp
+++ b/src/Conf.cpp
@@ -487,6 +487,9 @@ namespace sibs
                 else
                     fprintf(stderr, "Warning: Project contains tests directory but we got an error while retrieving the full path to it\n");
             }
+
+            if(config.isMainProject() && (config.packaging || config.bundling) && config.getPackageType() != PackageType::EXECUTABLE)
+                return Result<bool>::Err("Packaging is only supported for projects that are of type executable");
         }
 
         return parseResult;
@@ -1235,7 +1238,7 @@ namespace sibs
                     if(prependSpace)
                         cmakeArgs += TINYDIR_STRING(" ");
                     cmakeArgs += TINYDIR_STRING("\"-D");
-                    cmakeArgs += toFileString(string(arg.data, arg.size));
+                    cmakeArgs += toFileString(arg);
                     cmakeArgs += TINYDIR_STRING("\"");
                 }
             }
-- 
cgit v1.2.3