Make code compatible with gcc 7 using std::experimental::filesystem

clioptions.cpp

@@ -53,7 +53,7 @@ CliOptions parseCliOptions(int argc, char** argv)
                                     {"skip-instant-events"});
     args::Flag relativeTid(parser, "rtid", "subtract pid from tid so that main threads have tid = 0 (only works if vpid and vtid properties present in the context)",
                                     {"rtid"});
-    args::Positional<std::filesystem::path> pathArg(
+    args::Positional<fs::path> pathArg(
         parser, "path", "The path to an LTTng trace folder, will be searched recursively for trace data");
     try {
         parser.ParseCLI(argc, argv);
@@ -66,7 +66,7 @@ CliOptions parseCliOptions(int argc, char** argv)
     }
 
     const auto path = args::get(pathArg);
-    if (!std::filesystem::exists(path)) {
+    if (!fs::exists(path)) {
         std::cerr << "path does not exist: " << path << std::endl;
         exit(1);
     }

clioptions.h

@@ -27,14 +27,15 @@
 
 #pragma once
 
-#include <filesystem>
+#include "fs.h"
+
 #include <string>
 #include <vector>
 
 struct CliOptions
 {
     std::string outputFile;
-    std::filesystem::path path;
+    fs::path path;
     std::vector<std::string> exclude;
     std::vector<int64_t> pidWhitelist;
     std::vector<std::string> processWhitelist;

cmake/modules/FindBabeltrace.cmake

@@ -34,7 +34,7 @@ find_path(Babeltrace_LIBRARY_DIR
           NAMES libbabeltrace.so
           NAMES libbabeltrace-ctf.so
           PATHS ${Babeltrace_PATH_HINT}
-          PATH_SUFFIXES lib lib64
+          PATH_SUFFIXES lib lib64 lib/x86_64-linux-gnu
           DOC "The Babeltrace libraries")
 
 find_library(BABELTRACE NAMES babeltrace PATHS ${Babeltrace_LIBRARY_DIR})

ctf2ctf.cpp

@@ -37,7 +37,6 @@
 #include <cstring>
 
 #include <algorithm>
-#include <filesystem>
 #include <iomanip>
 #include <iostream>
 #include <limits>
@@ -50,6 +49,7 @@
 #include <variant>
 #include <vector>
 
+#include "fs.h"
 #include "clioptions.h"
 
 #include "config.h"
@@ -168,10 +168,10 @@ std::string rwbsToString(uint64_t rwbs)
 constexpr auto TIMESTAMP_PRECISION = std::numeric_limits<double>::max_digits10;
 
 template<typename Callback>
-void findMetadataFiles(const std::filesystem::path& path, Callback&& callback)
+void findMetadataFiles(const fs::path& path, Callback&& callback)
 {
-    for (const auto& entry : std::filesystem::recursive_directory_iterator(path)) {
-        if (entry.is_regular_file() && entry.path().filename() == "metadata")
+    for (const auto& entry : fs::recursive_directory_iterator(path)) {
+        if (fs::is_regular_file(entry.status()) && entry.path().filename() == "metadata")
             callback(entry.path().parent_path().c_str());
     }
 }

fs.h

@@ -0,0 +1,36 @@
+/*
+  fs.h
+
+  This file is part of ctf2ctf, a converter from LTTng/CTF to Chromium's Common Trace Format.
+
+  Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, [email protected]
+  Author: Milian Wolff <[email protected]>
+
+  Licensees holding valid commercial KDAB ctf2ctf licenses may use this file in
+  accordance with ctf2ctf Commercial License Agreement provided with the Software.
+
+  Contact [email protected] if any conditions of this licensing are not clear to you.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#if __has_include(<filesystem>)
+#include <filesystem>
+namespace fs = std::filesystem;
+#else
+#include <experimental/filesystem>
+namespace fs = std::experimental::filesystem;
+#endif