fixed compilation of transport-plugin under win32

This commit is contained in:
Vitaly Takmazov 2011-10-20 15:12:25 +04:00
parent 740e7c5835
commit 5fe8df717d
2 changed files with 12 additions and 1 deletions

View file

@ -5,9 +5,16 @@ FILE(GLOB HEADERS ../include/transport/*.h)
ADD_LIBRARY(transport-plugin SHARED ${HEADERS} ${SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS} ../../src/memoryusage.cpp ${CMAKE_CURRENT_BINARY_DIR}/../../include/transport/protocol.pb.cc)
ADD_DEPENDENCIES(transport-plugin pb)
SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
ADD_DEFINITIONS(-fPIC)
if (CMAKE_COMPILER_IS_GNUCXX)
ADD_DEFINITIONS(-fPIC)
endif()
if (NOT WIN32)
TARGET_LINK_LIBRARIES(transport-plugin ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES})
else()
TARGET_LINK_LIBRARIES(transport-plugin ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ws2_32.lib)
endif()
SET_TARGET_PROPERTIES(transport-plugin PROPERTIES
VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}

View file

@ -23,7 +23,11 @@
#include "log4cxx/basicconfigurator.h"
#include "transport/memoryusage.h"
#ifndef WIN32
#include <arpa/inet.h>
#else
#include <winsock2.h>
#endif
using namespace log4cxx;