From fbaacd9b708869560fa11cd75becb059a9a68b76 Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Sun, 2 Feb 2020 17:23:27 +0100 Subject: [PATCH] Remove `std::filesystem` to avoid trouble with clang in travis-ci. --- .travis.yml | 2 -- CMakeLists.txt | 2 -- tests/logging.cpp | 12 ------------ 3 files changed, 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index df69dbc..85de694 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,6 @@ matrix: packages: ['gcc-7', 'g++-7', 'lcov'] - name: "clang" - if: branch = travis env: - CXX=clang++-10 - CC=clang-10 @@ -73,7 +72,6 @@ matrix: packages: ['clang-10', 'clang++-10', 'clang-format-10', 'clang-tools-10', 'libc++-10-dev', 'libc++abi-10-dev'] - name: "mac" - if: branch = travis os: osx osx_image: xcode11.2 compiler: clang diff --git a/CMakeLists.txt b/CMakeLists.txt index a36624d..571d6de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,6 @@ include(ext_cmake_setup) include(ext_cmake_install) find_package(Threads REQUIRED) -find_package(Filesystem REQUIRED) if(NOT TARGET ext::basics) add_subdirectory(external_libs/ext-basics EXCLUDE_FROM_ALL) endif() @@ -74,7 +73,6 @@ target_compile_definitions(ext-logging PRIVATE EXT_IN_LIB=1) target_link_libraries(ext-logging PUBLIC ext::basics Threads::Threads - std::filesystem ) # set up folder structure for XCode and VisualStudio diff --git a/tests/logging.cpp b/tests/logging.cpp index eb01e07..0538233 100644 --- a/tests/logging.cpp +++ b/tests/logging.cpp @@ -1,14 +1,12 @@ // Copyright - 2016-2020 - Jan Christoph Uhde // Please see LICENSE.md for license or visit https://github.com/extcpp/basics #include -#include #include #include #include #include -#include #define EXT_LOGGING_DEFAULT_LEVEL warn #include @@ -36,16 +34,6 @@ struct LoggingTest : public ::testing::Test { ASSERT_EQ(expected, _log.str()); } - std::string path() { -#ifdef EXT_COMPILER_VC - return "logging.cpp"; -#else - auto path = std::filesystem::current_path().parent_path().parent_path().parent_path() / "logging" / "tests" / - "logging.cpp"; - return path.string(); -#endif // EXT_COMPILER_VC - }; - std::string line() { return std::to_string(_line); }