Skip to content

Commit

Permalink
Merge pull request #116 from chen-honggang/dev/uri-exception
Browse files Browse the repository at this point in the history
fixed macos compile error
  • Loading branch information
chen-honggang authored Jul 28, 2022
2 parents 7d76677 + ce8fc53 commit 849485e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ if (${OS_TYPE} STREQUAL "WINDOWS")
#需要加该参数,不然VS会报错
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wextra")
set(POCO_LINK_DIR ${CMAKE_SOURCE_DIR}/third_party/lib/linux/poco/)
if (${OS_TYPE} STREQUAL "APPLE")
set(POCO_LINK_DIR ${CMAKE_SOURCE_DIR}/third_party/lib/macOS/poco/)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wextra")
endif()
set(POCO_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/third_party/include/)
set(POCO_LIBS PocoNetSSL PocoNet PocoCrypto PocoUtil PocoJSON PocoFoundation PocoXML)
Expand Down
2 changes: 2 additions & 0 deletions include/request/object_req.h
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,9 @@ class GetObjectByFileReq : public GetObjectReq {
#endif

private:
#if defined(_WIN32)
bool mb_is_widechar_path;
#endif
std::string m_local_file_path;
};

Expand Down

0 comments on commit 849485e

Please sign in to comment.