From ab712cf153e543e84a5c6484e19d22ba90bdbeff Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Sun, 31 Dec 2017 06:17:54 +0100
Subject: 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.
---
 src/GlobalLib.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/GlobalLib.cpp')

diff --git a/src/GlobalLib.cpp b/src/GlobalLib.cpp
index ac8fd59..69c4ebb 100644
--- a/src/GlobalLib.cpp
+++ b/src/GlobalLib.cpp
@@ -149,6 +149,7 @@ namespace sibs
         }
 
         backend::Ninja ninja;
+        // TODO: Use same source file finder as in main.cpp
         FileWalkCallbackFunc collectSourceFiles = [&ninja, &sibsConfig, &collectSourceFiles](tinydir_file *file)
         {
             FileString pathNative = file->path;
@@ -177,7 +178,7 @@ namespace sibs
                     string filePathUtf8 = toUtf8(pathNative.c_str());
                     ninja.addTestSourceDir(filePathUtf8.c_str());
                 }
-                else
+                else if(!directoryToIgnore(pathNative, sibsConfig.getIgnoreDirs()))
                     walkDir(file->path, collectSourceFiles);
             }
         };
@@ -306,4 +307,4 @@ namespace sibs
 
         return Archive::extract(libArchivedFilePath.c_str(), libPath.c_str());
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3