Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ matrix:
packages: ['gcc-7', 'g++-7', 'lcov']

- name: "clang"
if: branch = travis
env:
- CXX=clang++-10
- CC=clang-10
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions tests/logging.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
// Copyright - 2016-2020 - Jan Christoph Uhde <Jan@UhdeJC.com>
// Please see LICENSE.md for license or visit https://github.com/extcpp/basics
#include <cstring>
#include <filesystem>
#include <sstream>

#include <gtest/gtest.h>

#include <ext/macros/platform.hpp>
#include <ext/util/except.hpp>
#include <ext/util/files.hpp>

#define EXT_LOGGING_DEFAULT_LEVEL warn
#include <ext/logging.hpp>
Expand Down Expand Up @@ -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);
}
Expand Down