UnknownObject/WebCC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable C++11 on GCC; Link boost libs and pthread on GCC.

Browse Source
This commit is contained in:
Chunting Gu
2018-04-07 11:05:14 +08:00
parent c557430b8e
commit 23090ee369
12 changed files with 210 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+8 -2
View File
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.1.0)
project(webcc) project(webcc)
option(WEBCC_ENABLE_SOAP "Enable SOAP support (need PugiXml)?" ON) option(WEBCC_ENABLE_SOAP "Enable SOAP support (need PugiXml)?" ON)
@@ -58,12 +58,18 @@ macro(GROUP_SOURCES_BY_DIR source_files)
endforeach() endforeach()
endmacro() endmacro()
# CMake 3.1.0+
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
# Boost version: 1.66+ # Boost version: 1.66+
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
find_package(Boost) set(Boost_USE_MULTITHREADED ON)
find_package(Boost 1.66.0 REQUIRED COMPONENTS system thread)
if(Boost_FOUND) if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS})
message(STATUS ${Boost_LIBRARIES})
endif() endif()
include_directories(${PROJECT_SOURCE_DIR}/src) include_directories(${PROJECT_SOURCE_DIR}/src)
compile_commands.json
+157
View File
@@ -0,0 +1,157 @@
[
{
"directory": "/home/adam/github/webcc/build/src/gtest",
"command": "/usr/bin/c++ -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/gtest.dir/gtest-all.cc.o -c /home/adam/github/webcc/src/gtest/gtest-all.cc",
"file": "/home/adam/github/webcc/src/gtest/gtest-all.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/gtest",
"command": "/usr/bin/c++ -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/gtest.dir/gtest_main.cc.o -c /home/adam/github/webcc/src/gtest/gtest_main.cc",
"file": "/home/adam/github/webcc/src/gtest/gtest_main.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/pugixml",
"command": "/usr/bin/c++ -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -o CMakeFiles/pugixml.dir/pugixml.cpp.o -c /home/adam/github/webcc/src/pugixml/pugixml.cpp",
"file": "/home/adam/github/webcc/src/pugixml/pugixml.cpp"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/common.cc.o -c /home/adam/github/webcc/src/webcc/common.cc",
"file": "/home/adam/github/webcc/src/webcc/common.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/http_client.cc.o -c /home/adam/github/webcc/src/webcc/http_client.cc",
"file": "/home/adam/github/webcc/src/webcc/http_client.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/http_message.cc.o -c /home/adam/github/webcc/src/webcc/http_message.cc",
"file": "/home/adam/github/webcc/src/webcc/http_message.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/http_parser.cc.o -c /home/adam/github/webcc/src/webcc/http_parser.cc",
"file": "/home/adam/github/webcc/src/webcc/http_parser.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/http_request.cc.o -c /home/adam/github/webcc/src/webcc/http_request.cc",
"file": "/home/adam/github/webcc/src/webcc/http_request.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/http_request_handler.cc.o -c /home/adam/github/webcc/src/webcc/http_request_handler.cc",
"file": "/home/adam/github/webcc/src/webcc/http_request_handler.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/http_request_parser.cc.o -c /home/adam/github/webcc/src/webcc/http_request_parser.cc",
"file": "/home/adam/github/webcc/src/webcc/http_request_parser.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/http_response.cc.o -c /home/adam/github/webcc/src/webcc/http_response.cc",
"file": "/home/adam/github/webcc/src/webcc/http_response.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/http_response_parser.cc.o -c /home/adam/github/webcc/src/webcc/http_response_parser.cc",
"file": "/home/adam/github/webcc/src/webcc/http_response_parser.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/http_server.cc.o -c /home/adam/github/webcc/src/webcc/http_server.cc",
"file": "/home/adam/github/webcc/src/webcc/http_server.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/http_session.cc.o -c /home/adam/github/webcc/src/webcc/http_session.cc",
"file": "/home/adam/github/webcc/src/webcc/http_session.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/rest_server.cc.o -c /home/adam/github/webcc/src/webcc/rest_server.cc",
"file": "/home/adam/github/webcc/src/webcc/rest_server.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/url.cc.o -c /home/adam/github/webcc/src/webcc/url.cc",
"file": "/home/adam/github/webcc/src/webcc/url.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/utility.cc.o -c /home/adam/github/webcc/src/webcc/utility.cc",
"file": "/home/adam/github/webcc/src/webcc/utility.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/soap_client.cc.o -c /home/adam/github/webcc/src/webcc/soap_client.cc",
"file": "/home/adam/github/webcc/src/webcc/soap_client.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/soap_server.cc.o -c /home/adam/github/webcc/src/webcc/soap_server.cc",
"file": "/home/adam/github/webcc/src/webcc/soap_server.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/soap_message.cc.o -c /home/adam/github/webcc/src/webcc/soap_message.cc",
"file": "/home/adam/github/webcc/src/webcc/soap_message.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/soap_request.cc.o -c /home/adam/github/webcc/src/webcc/soap_request.cc",
"file": "/home/adam/github/webcc/src/webcc/soap_request.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/soap_response.cc.o -c /home/adam/github/webcc/src/webcc/soap_response.cc",
"file": "/home/adam/github/webcc/src/webcc/soap_response.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/webcc",
"command": "/usr/bin/c++ -DBOOST_ASIO_NO_DEPRECATED -DWEBCC_DEBUG_OUTPUT -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/webcc.dir/soap_xml.cc.o -c /home/adam/github/webcc/src/webcc/soap_xml.cc",
"file": "/home/adam/github/webcc/src/webcc/soap_xml.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/demo/soap/calc_client",
"command": "/usr/bin/c++ -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/soap_calc_client.dir/calc_client.cc.o -c /home/adam/github/webcc/src/demo/soap/calc_client/calc_client.cc",
"file": "/home/adam/github/webcc/src/demo/soap/calc_client/calc_client.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/demo/soap/calc_client",
"command": "/usr/bin/c++ -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/soap_calc_client.dir/main.cc.o -c /home/adam/github/webcc/src/demo/soap/calc_client/main.cc",
"file": "/home/adam/github/webcc/src/demo/soap/calc_client/main.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/demo/soap/calc_server",
"command": "/usr/bin/c++ -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/soap_calc_server.dir/calc_service.cc.o -c /home/adam/github/webcc/src/demo/soap/calc_server/calc_service.cc",
"file": "/home/adam/github/webcc/src/demo/soap/calc_server/calc_service.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/demo/soap/calc_server",
"command": "/usr/bin/c++ -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/soap_calc_server.dir/main.cc.o -c /home/adam/github/webcc/src/demo/soap/calc_server/main.cc",
"file": "/home/adam/github/webcc/src/demo/soap/calc_server/main.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/demo/rest/book_client",
"command": "/usr/bin/c++ -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/rest_book_client.dir/book_client.cc.o -c /home/adam/github/webcc/src/demo/rest/book_client/book_client.cc",
"file": "/home/adam/github/webcc/src/demo/rest/book_client/book_client.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/demo/rest/book_client",
"command": "/usr/bin/c++ -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/rest_book_client.dir/main.cc.o -c /home/adam/github/webcc/src/demo/rest/book_client/main.cc",
"file": "/home/adam/github/webcc/src/demo/rest/book_client/main.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/demo/rest/book_server",
"command": "/usr/bin/c++ -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/rest_book_server.dir/book_services.cc.o -c /home/adam/github/webcc/src/demo/rest/book_server/book_services.cc",
"file": "/home/adam/github/webcc/src/demo/rest/book_server/book_services.cc"
},
{
"directory": "/home/adam/github/webcc/build/src/demo/rest/book_server",
"command": "/usr/bin/c++ -DWEBCC_ENABLE_SOAP -I/home/adam/include -I/home/adam/github/webcc/src -std=c++11 -std=c++11 -o CMakeFiles/rest_book_server.dir/main.cc.o -c /home/adam/github/webcc/src/demo/rest/book_server/main.cc",
"file": "/home/adam/github/webcc/src/demo/rest/book_server/main.cc"
}
]
src/CMakeLists.txt
+5 -1
View File
@@ -1,3 +1,7 @@
if(UNIX)
add_definitions(-std=c++11)
endif()
if(WEBCC_ENABLE_UT) if(WEBCC_ENABLE_UT)
add_subdirectory(gtest) add_subdirectory(gtest)
add_subdirectory(webcc_unittest) add_subdirectory(webcc_unittest)
@@ -16,4 +20,4 @@ if(WEBCC_ENABLE_DEMO)
endif() endif()
add_subdirectory(demo/rest/book_client) add_subdirectory(demo/rest/book_client)
add_subdirectory(demo/rest/book_server) add_subdirectory(demo/rest/book_server)
endif() endif()
src/demo/rest/book_client/CMakeLists.txt
+6 -1
View File
@@ -1,5 +1,10 @@
if(UNIX)
add_definitions(-std=c++11)
endif()
file(GLOB SRCS *.cc *.h) file(GLOB SRCS *.cc *.h)
add_executable(rest_book_client ${SRCS}) add_executable(rest_book_client ${SRCS})
target_link_libraries(rest_book_client webcc) target_link_libraries(rest_book_client webcc ${Boost_LIBRARIES})
target_link_libraries(rest_book_client "${CMAKE_THREAD_LIBS_INIT}")
src/demo/rest/book_server/CMakeLists.txt
+6 -1
View File
@@ -1,5 +1,10 @@
if(UNIX)
add_definitions(-std=c++11)
endif()
file(GLOB SRCS *.cc *.h) file(GLOB SRCS *.cc *.h)
add_executable(rest_book_server ${SRCS}) add_executable(rest_book_server ${SRCS})
target_link_libraries(rest_book_server webcc) target_link_libraries(rest_book_server webcc ${Boost_LIBRARIES})
target_link_libraries(rest_book_server "${CMAKE_THREAD_LIBS_INIT}")
src/demo/soap/calc_client/CMakeLists.txt
+7 -1
View File
@@ -1,5 +1,11 @@
if(UNIX)
add_definitions(-std=c++11)
endif()
file(GLOB SRCS *.cc *.h) file(GLOB SRCS *.cc *.h)
add_executable(soap_calc_client ${SRCS}) add_executable(soap_calc_client ${SRCS})
target_link_libraries(soap_calc_client webcc pugixml) target_link_libraries(soap_calc_client webcc pugixml ${Boost_LIBRARIES})
target_link_libraries(soap_calc_client "${CMAKE_THREAD_LIBS_INIT}")
src/demo/soap/calc_server/CMakeLists.txt
+6 -1
View File
@@ -1,5 +1,10 @@
if(UNIX)
add_definitions(-std=c++11)
endif()
file(GLOB SRCS *.cc *.h) file(GLOB SRCS *.cc *.h)
add_executable(soap_calc_server ${SRCS}) add_executable(soap_calc_server ${SRCS})
target_link_libraries(soap_calc_server webcc pugixml) target_link_libraries(soap_calc_server webcc pugixml ${Boost_LIBRARIES})
target_link_libraries(soap_calc_server "${CMAKE_THREAD_LIBS_INIT}")
src/gtest/CMakeLists.txt
+4
View File
@@ -1,3 +1,7 @@
if(UNIX)
add_definitions(-std=c++11)
endif()
set(SRCS set(SRCS
gtest-all.cc gtest-all.cc
gtest_main.cc gtest_main.cc
src/webcc/CMakeLists.txt
+4
View File
@@ -1,3 +1,7 @@
if(UNIX)
add_definitions(-std=c++11)
endif()
option(WEBCC_DEBUG_OUTPUT "Enable debug output?" OFF) option(WEBCC_DEBUG_OUTPUT "Enable debug output?" OFF)
if(WEBCC_DEBUG_OUTPUT) if(WEBCC_DEBUG_OUTPUT)
src/webcc/http_client.cc
+4 -3
View File
@@ -37,7 +37,7 @@ static void SetTimeout(boost::asio::ip::tcp::socket& socket,
#else // POSIX #else // POSIX
struct timeval tv; struct timeval tv;
tv.tv_sec = timeout_seconds_; tv.tv_sec = timeout_seconds;
tv.tv_usec = 0; tv.tv_usec = 0;
setsockopt(socket.native_handle(), SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); setsockopt(socket.native_handle(), SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
setsockopt(socket.native_handle(), SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)); setsockopt(socket.native_handle(), SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
@@ -107,11 +107,12 @@ Error HttpClient::SendRequest(const HttpRequest& request,
size_t length = socket.read_some(boost::asio::buffer(buffer_), ec); size_t length = socket.read_some(boost::asio::buffer(buffer_), ec);
if (length == 0 || ec) { if (length == 0 || ec) {
#if defined _WINDOWS
if (ec.value() == WSAETIMEDOUT) { if (ec.value() == WSAETIMEDOUT) {
return kSocketTimeoutError; return kSocketTimeoutError;
} else {
return kSocketReadError;
} }
#endif
return kSocketReadError;
} }
#if WEBCC_DEBUG_OUTPUT #if WEBCC_DEBUG_OUTPUT
src/webcc/http_response.cc
+2 -1
View File
@@ -1,4 +1,5 @@
#include "webcc/http_response.h" #include "webcc/http_response.h"
#include <iostream>
namespace webcc { namespace webcc {
@@ -98,7 +99,7 @@ std::vector<boost::asio::const_buffer> HttpResponse::ToBuffers() const {
if (IsContentLengthValid()) { if (IsContentLengthValid()) {
buffers.push_back(boost::asio::buffer(content_)); buffers.push_back(boost::asio::buffer(content_));
} }
return buffers; return buffers;
} }
src/webcc/soap_client.cc
+1 -1
View File
@@ -45,7 +45,7 @@ Error SoapClient::Call(const std::string& operation,
http_request.SetHeader(kSoapAction, operation); http_request.SetHeader(kSoapAction, operation);
http_request.set_content(std::move(http_content)); http_request.set_content(std::move(http_content));
http_request.MakeStartLine(); http_request.Build();
HttpResponse http_response; HttpResponse http_response;