aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2017-12-31 06:17:54 +0100
committerdec05eba <dec05eba@protonmail.com>2017-12-31 06:19:50 +0100
commitab712cf153e543e84a5c6484e19d22ba90bdbeff (patch)
treeb82b101b586deb6caca63a1de8737a89e82bd4f5 /include
parentae213b2b6f8dcc75de53ab27b0b35bc3455a8eb3 (diff)
Add cmake building, add ignore dirs option
Sometimes it's not possible to build new sibs with older sibs because of changes that break backwards compatbility. If sibs installation fails with sibs, use cmake.
Diffstat (limited to 'include')
-rw-r--r--include/Conf.hpp7
-rw-r--r--include/FileUtil.hpp1
2 files changed, 8 insertions, 0 deletions
diff --git a/include/Conf.hpp b/include/Conf.hpp
index 2cb387c..d8ce3a8 100644
--- a/include/Conf.hpp
+++ b/include/Conf.hpp
@@ -140,6 +140,7 @@ namespace sibs
bool containsPlatform(const std::vector<Platform> &platforms, Platform platform);
const char* asString(Platform platform);
const char* asString(OptimizationLevel optLevel);
+ bool directoryToIgnore(const FileString &dir, const std::vector<std::string> &ignoreDirList);
class SibsConfig : public ConfigCallback
{
@@ -209,6 +210,11 @@ namespace sibs
return releaseStaticLibs;
}
+ const std::vector<std::string>& getIgnoreDirs() const
+ {
+ return ignoreDirs;
+ }
+
void setPackageType(PackageType packageType)
{
this->packageType = packageType;
@@ -232,6 +238,7 @@ namespace sibs
std::vector<std::string> includeDirs;
std::vector<std::string> exposeIncludeDirs;
std::vector<Platform> platforms;
+ std::vector<std::string> ignoreDirs;
std::unordered_map<std::string, std::string> defines;
OptimizationLevel optimizationLevel;
std::vector<std::string> debugStaticLibs;
diff --git a/include/FileUtil.hpp b/include/FileUtil.hpp
index f2679a0..90b9ca3 100644
--- a/include/FileUtil.hpp
+++ b/include/FileUtil.hpp
@@ -53,6 +53,7 @@ namespace sibs
// Note: Will not delete created directories if this operation fails for some reason
Result<bool> createDirectoryRecursive(const _tinydir_char_t *path);
Result<FileString> getRealPath(const _tinydir_char_t *path);
+ bool pathEquals(const std::string &path, const std::string &otherPath);
}
#endif //SIBS_FILEUTIL_HPP