Procházet zdrojové kódy

修复一些vc编译问题,gtest glog protobuf 都需要使用mtd模式编译库

tanghai před 14 roky
rodič
revize
53f653b6ea

+ 3 - 2
Cpp/CMakeLists.txt

@@ -70,8 +70,9 @@ IF(MSVC)
 	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libcmt.lib")
 	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:msvcrt.lib")
 	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libcd.lib")
-	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libcmtd.lib")
-	ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB -DBOOST_PYTHON_STATIC_LIB -DWIN64)
+	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:msvcrtd.lib")
+	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:msvcprtd.lib")
+	ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB -DBOOST_PYTHON_STATIC_LIB -DGOOGLE_GLOG_DLL_DECL= -DGFLAGS_DLL_DECL=)
 ENDIF()
 
 ADD_SUBDIRECTORY(Platform)

+ 1 - 1
Cpp/Cmake/FindPerftools.cmake

@@ -1,4 +1,4 @@
-FIND_PATH(PERFTOOLS_INCLUDE_DIR google/heap-profiler.h)
+FIND_PATH(PERFTOOLS_INCLUDE_DIR google/tcmalloc.h)
 
 IF(WIN32)
 	set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")

+ 1 - 1
Cpp/Platform/CMakeLists.txt

@@ -1,4 +1,4 @@
 ADD_SUBDIRECTORY(Python)
 ADD_SUBDIRECTORY(Thread)
 ADD_SUBDIRECTORY(Rpc)
-ADD_SUBDIRECTORY(Orm)
+ADD_SUBDIRECTORY(Orm)

+ 1 - 3
Cpp/Platform/Rpc/RpcClientTest.cc

@@ -37,7 +37,7 @@ public:
 	{
 		if (err)
 		{
-			LOG(ERROR) << "async accept failed: " << err.message();
+			LOG(WARNING) << "async accept failed: " << err.message();
 			return;
 		}
 		RpcMetaPtr meta(new RpcMeta());
@@ -53,13 +53,11 @@ public:
 
 	virtual void OnRecvMessage(RpcMetaPtr meta, StringPtr message)
 	{
-		// 接收消息
 		EchoRequest request;
 		request.ParseFromString(*message);
 
 		num = request.num();
 
-		// 回一个消息
 		EchoResponse response;
 		response.set_num(num);