diff --git a/.gitignore b/.gitignore index c050360..eea3363 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ build .cache cmake-* .xmake -compile_commands.json \ No newline at end of file +compile_commands.json +out diff --git a/CMakeLists.txt b/CMakeLists.txt index a38a7da..6ef535b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,19 +4,19 @@ project(transm LANGUAGES CXX) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -if (MSVC) - add_compile_options(/source-charset:utf-8) +if(MSVC) +add_compile_options(/source-charset:utf-8) endif() -if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_SYSTEM_NAME MATCHES "Windows") - MESSAGE(STATUS "Add MinGW Param.") - add_compile_options(-finput-charset=utf-8) - add_compile_options(-fexec-charset=gbk) - add_compile_options(-Wa,-mbig-obj) +if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_SYSTEM_NAME MATCHES "Windows") +message(status "add mingw param.") +add_compile_options(-finput-charset=utf-8) +add_compile_options(-fexec-charset=gbk) +add_compile_options(-Wa,-mbig-obj) endif() if(DEFINED IOS_ISH) - message(STATUS "INPUT IOS_ISH ${IOS_ISH}") +message(STATUS "INPUT IOS_ISH ${IOS_ISH}") endif() set(CMAKE_DEBUG_POSTFIX "d") @@ -24,11 +24,13 @@ message(STATUS "System: ${CMAKE_SYSTEM_NAME}") message(STATUS "Compiler CXX ID: ${CMAKE_CXX_COMPILER_ID}") set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib/${CMAKE_BUILD_TYPE}) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}/) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY + ${PROJECT_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}/ +) include_directories(3rd) include_directories(.) -include_directories(build) +include_directories(${PROJECT_BINARY_DIR}) add_subdirectory(ofen) add_subdirectory(net) add_subdirectory(util) diff --git a/client/client.cpp b/client/client.cpp index 6efb039..6da440e 100644 --- a/client/client.cpp +++ b/client/client.cpp @@ -19,7 +19,6 @@ CClient::CClient(const std::shared_ptr& logger) : logger_(logger supported_.push_back("Get"); sleep_.set_timeout(5000); } - CClient::~CClient() { th_run_ = false; @@ -757,4 +756,4 @@ std::vector CFileOpr::get_file_list(const std::string& input) result.push_back(COfPath::to_full(ret)); } return result; -} \ No newline at end of file +} diff --git a/util/util.cpp b/util/util.cpp index 2ba5182..2094bf8 100644 --- a/util/util.cpp +++ b/util/util.cpp @@ -146,4 +146,4 @@ CFrameBuffer::~CFrameBuffer() { delete[] data_; len_ = 0; -} \ No newline at end of file +}