Skip to content

Commit 1cdc023

Browse files
authored
Remove std::filesystem to avoid trouble with clang in travis-ci. (#5)
1 parent 05ab581 commit 1cdc023

File tree

3 files changed

+0
-16
lines changed

3 files changed

+0
-16
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ matrix:
6060
packages: ['gcc-7', 'g++-7', 'lcov']
6161

6262
- name: "clang"
63-
if: branch = travis
6463
env:
6564
- CXX=clang++-10
6665
- CC=clang-10
@@ -73,7 +72,6 @@ matrix:
7372
packages: ['clang-10', 'clang++-10', 'clang-format-10', 'clang-tools-10', 'libc++-10-dev', 'libc++abi-10-dev']
7473

7574
- name: "mac"
76-
if: branch = travis
7775
os: osx
7876
osx_image: xcode11.2
7977
compiler: clang

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ include(ext_cmake_setup)
2323
include(ext_cmake_install)
2424

2525
find_package(Threads REQUIRED)
26-
find_package(Filesystem REQUIRED)
2726
if(NOT TARGET ext::basics)
2827
add_subdirectory(external_libs/ext-basics EXCLUDE_FROM_ALL)
2928
endif()
@@ -74,7 +73,6 @@ target_compile_definitions(ext-logging PRIVATE EXT_IN_LIB=1)
7473
target_link_libraries(ext-logging PUBLIC
7574
ext::basics
7675
Threads::Threads
77-
std::filesystem
7876
)
7977

8078
# set up folder structure for XCode and VisualStudio

tests/logging.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
// Copyright - 2016-2020 - Jan Christoph Uhde <[email protected]>
22
// Please see LICENSE.md for license or visit https://github.com/extcpp/basics
33
#include <cstring>
4-
#include <filesystem>
54
#include <sstream>
65

76
#include <gtest/gtest.h>
87

98
#include <ext/macros/platform.hpp>
109
#include <ext/util/except.hpp>
11-
#include <ext/util/files.hpp>
1210

1311
#define EXT_LOGGING_DEFAULT_LEVEL warn
1412
#include <ext/logging.hpp>
@@ -36,16 +34,6 @@ struct LoggingTest : public ::testing::Test {
3634
ASSERT_EQ(expected, _log.str());
3735
}
3836

39-
std::string path() {
40-
#ifdef EXT_COMPILER_VC
41-
return "logging.cpp";
42-
#else
43-
auto path = std::filesystem::current_path().parent_path().parent_path().parent_path() / "logging" / "tests" /
44-
"logging.cpp";
45-
return path.string();
46-
#endif // EXT_COMPILER_VC
47-
};
48-
4937
std::string line() {
5038
return std::to_string(_line);
5139
}

0 commit comments

Comments
 (0)