mirrors/TarsCloud_TarsCpp
1
0
Fork 0
mirror of https://gitee.com/TarsCloud/TarsCpp.git synced 2025-01-03 05:22:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix build error on windows

Browse Source
This commit is contained in:
cuijg 2021-10-31 05:58:00 +08:00
parent 05f3f844bb
commit d0eb946e57
6 changed files with 927 additions and 909 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Common.cmake
View File

@ -85,6 +85,10 @@ ELSE ()
MESSAGE(STATUS "================ ERROR: This platform is unsupported!!! ================") MESSAGE(STATUS "================ ERROR: This platform is unsupported!!! ================")
ENDIF (UNIX) ENDIF (UNIX)
IF (WIN32)
add_definitions(-DNOMINMAX)
ENDIF ()
#------------------------------------------------------------- #-------------------------------------------------------------
set(TARS2CPP "${CMAKE_BINARY_DIR}/bin/tars2cpp") set(TARS2CPP "${CMAKE_BINARY_DIR}/bin/tars2cpp")

27
cmake/Thirdparty.cmake
View File

@ -47,6 +47,9 @@ set(LIB_SSL)
set(LIB_CRYPTO) set(LIB_CRYPTO)
set(LIB_PROTOBUF) set(LIB_PROTOBUF)
set(LIB_GTEST) set(LIB_GTEST)
set(LIB_GPERF)
set(LIB_TCMALLOC_PROFILER)
set(LIB_TCMALLOC_MINIMAL)
#------------------------------------------------------------- #-------------------------------------------------------------
add_custom_target(thirdparty) add_custom_target(thirdparty)
@ -55,21 +58,23 @@ include(ExternalProject)
if (TARS_GPERF) if (TARS_GPERF)
set(GPERF_DIR_INC "${THIRDPARTY_PATH}/gpref/include") set(GPERF_DIR_INC "${THIRDPARTY_PATH}/gperf/include")
set(GRPEF_DIR_LIB "${THIRDPARTY_PATH}/gpref/lib") set(GRPEF_DIR_LIB "${THIRDPARTY_PATH}/gperf/lib")
include_directories(${GPERF_DIR_INC}) include_directories(${GPERF_DIR_INC})
link_directories(${GRPEF_DIR_LIB}) link_directories(${GRPEF_DIR_LIB})
if (UNIX) if (UNIX)
set(LIB_GPERF "profiler") set(LIB_GPERF "profiler")
set(LIB_TCMALLOC_PROFILER "tcmalloc_and_profiler")
set(LIB_TCMALLOC_MINIMAL "tcmalloc_and_minimal")
ExternalProject_Add(ADD_${LIB_GPERF} ExternalProject_Add(ADD_${LIB_GPERF}
URL https://tars-thirdpart-1300910346.cos.ap-guangzhou.myqcloud.com//src/gperftools-2.7.tar.gz URL https://tars-thirdpart-1300910346.cos.ap-guangzhou.myqcloud.com//src/gperftools-2.7.tar.gz
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/download DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/download
PREFIX ${CMAKE_BINARY_DIR} PREFIX ${CMAKE_BINARY_DIR}
INSTALL_DIR ${CMAKE_SOURCE_DIR} INSTALL_DIR ${CMAKE_SOURCE_DIR}
CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/src/gpref --disable-shared --disable-debugalloc CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/src/gperf --disable-shared --disable-debugalloc
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/gpref-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/gperf-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make BUILD_COMMAND make
# INSTALL_COMMAND ${CMAKE_COMMAND} --build . --config release --target install # INSTALL_COMMAND ${CMAKE_COMMAND} --build . --config release --target install
@ -78,11 +83,11 @@ if (TARS_GPERF)
add_dependencies(thirdparty ADD_${LIB_GPERF}) add_dependencies(thirdparty ADD_${LIB_GPERF})
INSTALL(FILES ${CMAKE_BINARY_DIR}/src/gpref/bin/pprof INSTALL(FILES ${CMAKE_BINARY_DIR}/src/gperf/bin/pprof
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ
DESTINATION thirdparty/bin/) DESTINATION thirdparty/bin/)
INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/src/gpref/lib DESTINATION thirdparty) INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/src/gperf/lib DESTINATION thirdparty)
INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/src/gpref/include/gperftools DESTINATION thirdparty/include) INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/src/gperf/include/gperftools DESTINATION thirdparty/include)
endif (UNIX) endif (UNIX)
@ -92,7 +97,7 @@ endif (TARS_GPERF)
if(WIN32) if(WIN32)
ExternalProject_Add(ADD_CURL ExternalProject_Add(ADD_CURL
URL http://cdn.tarsyun.com/src/curl-7.69.1.tar.gz URL http://cdn.tarsyun.com/src/curl-7.69.1.tar.gz
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/download DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/download
PREFIX ${CMAKE_BINARY_DIR} PREFIX ${CMAKE_BINARY_DIR}
INSTALL_DIR ${CMAKE_SOURCE_DIR} INSTALL_DIR ${CMAKE_SOURCE_DIR}
@ -124,7 +129,7 @@ if (WIN32)
CONFIGURE_COMMAND ${CMAKE_COMMAND} . -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/src/gtest -A x64 -Dgtest_force_shared_crt=on CONFIGURE_COMMAND ${CMAKE_COMMAND} . -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/src/gtest -A x64 -Dgtest_force_shared_crt=on
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/gtest-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/gtest-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} --target install INSTALL_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} --target install
URL_MD5 82358affdd7ab94854c8ee73a180fc53 URL_MD5 82358affdd7ab94854c8ee73a180fc53
) )
@ -213,7 +218,7 @@ if (TARS_SSL)
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/download DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/download
PREFIX ${CMAKE_BINARY_DIR} PREFIX ${CMAKE_BINARY_DIR}
INSTALL_DIR ${CMAKE_SOURCE_DIR} INSTALL_DIR ${CMAKE_SOURCE_DIR}
CONFIGURE_COMMAND perl Configure --prefix=${CMAKE_BINARY_DIR}/src/openssl VC-WIN64A no-asm CONFIGURE_COMMAND perl Configure --prefix=${CMAKE_BINARY_DIR}/src/openssl --openssldir=ssl VC-WIN64A no-asm
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/openssl-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/openssl-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND nmake BUILD_COMMAND nmake
@ -229,7 +234,7 @@ if (TARS_SSL)
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/download DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/download
PREFIX ${CMAKE_BINARY_DIR} PREFIX ${CMAKE_BINARY_DIR}
INSTALL_DIR ${CMAKE_SOURCE_DIR} INSTALL_DIR ${CMAKE_SOURCE_DIR}
CONFIGURE_COMMAND ./config --prefix=${CMAKE_BINARY_DIR}/src/openssl no-shared CONFIGURE_COMMAND ./config --prefix=${CMAKE_BINARY_DIR}/src/openssl --openssldir=ssl no-shared
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/openssl-lib SOURCE_DIR ${CMAKE_BINARY_DIR}/src/openssl-lib
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make BUILD_COMMAND make

2
tools/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 3.2)
project(tools) project(tools)
include_directories(${util_SOURCE_DIR}/include) include_directories(${util_SOURCE_DIR}/include)

2
util/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 3.2)
project(util) project(util)
if(WIN32) if(WIN32)

8
util/include/util/tc_common.h
View File

@ -49,6 +49,14 @@
using namespace std; using namespace std;
#if TARGET_PLATFORM_WINDOWS
#ifndef ssize_t
#define ssize_t __int64
#endif
#endif
namespace tars namespace tars
{ {
///////////////////////////////////////////////// /////////////////////////////////////////////////

1793
util/src/epoll_windows/src/epoll.cpp
View File

File diff suppressed because it is too large Load Diff