Skip to content

Commit e713d99

Browse files
authored
Merge pull request #290 from milutinke/master
Fixed compilation errors
2 parents 2ea62d9 + 0a6768d commit e713d99

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

cmake/external_dependencies.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
include(CheckCXXSourceCompiles)
32
include(FetchContent)
43

@@ -72,6 +71,7 @@ function(setup_curlpp)
7271
set(CURLPP_LIB_PATH3 "${curlpp_BINARY_DIR}/libcurlpp.so.1.0.0" PARENT_SCOPE)
7372
endif()
7473
add_library(curlpp::curlpp ALIAS curlpp)
74+
target_compile_options(curlpp PRIVATE -fpermissive)
7575
endfunction()
7676

7777
function(setup_doctest)

src/common/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ file(GLOB_RECURSE SOURCES *.cpp *.hpp)
33
add_library(common STATIC ${SOURCES})
44
target_compile_definitions(common PRIVATE "-DREPOSITORY_VERSION=${COMMIT_COUNT}")
55
target_include_directories(common INTERFACE .)
6+
target_compile_options(common PRIVATE -fpermissive)
67
target_link_libraries(common PRIVATE curlpp::curlpp curl fmt::fmt-header-only nlohmann::json spdlog::spdlog)
78

89
if (UNIX AND NOT APPLE)

src/common/fmt_custom_formatters.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ struct fmt::formatter<std::filesystem::path>
1414
}
1515

1616
template<typename FormatContext>
17-
auto format(std::filesystem::path const &path, FormatContext &context)
17+
auto format(std::filesystem::path const &path, FormatContext &context) const
1818
{
1919
// replicate fmt 7.x behavior - '/path' gets formatted to '"/path"'
2020
return format_to(context.out(), "\"{}\"", path.string());
2121
}
2222
};
23-

0 commit comments

Comments
 (0)