aboutsummaryrefslogtreecommitdiff
path: root/src/Conf.cpp
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-10-02 21:14:45 +0200
committerdec05eba <dec05eba@protonmail.com>2020-07-06 07:39:33 +0200
commitd22001283a49ad723da0023039c904dc6db7c5a0 (patch)
tree4ec8b61a33b57ad2ccec5cc1309ea1f927620ef2 /src/Conf.cpp
parent7a483ac5f0e483dd9dff2a22ee4f0480ab75f039 (diff)
Fix bundle for non system libraries
Diffstat (limited to 'src/Conf.cpp')
-rw-r--r--src/Conf.cpp5
1 files changed, 4 insertions, 1 deletions
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("\"");
}
}