Просмотр исходного кода

glog gflags集成,目前windows版可以编译通过了!!

tanghai 14 лет назад
Родитель
Сommit
716d46a62c
3 измененных файлов с 12 добавлено и 4 удалено
  1. 5 1
      Cpp/CMakeLists.txt
  2. 3 3
      Cpp/Platform/Mono/CMakeLists.txt
  3. 4 0
      Cpp/Platform/Rpc/RpcSessionTest.cc

+ 5 - 1
Cpp/CMakeLists.txt

@@ -26,6 +26,9 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ThirdParty)
 FIND_PACKAGE(GLog REQUIRED)
 INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIR})
 
+FIND_PACKAGE(GFlags REQUIRED)
+INCLUDE_DIRECTORIES(${GFLAGS_INCLUDE_DIR})
+
 FIND_PACKAGE(Protobuf REQUIRED)
 INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
 LINK_DIRECTORIES(${PROTOBUF_LIBRARY_DIR})
@@ -47,6 +50,7 @@ SET(ThirdPartyLibs
 	gtest
 	gmock
 	${GLOG_LIBRARIES}
+	${GFLAGS_LIBRARIES}
 	${PROTOBUF_LIBRARIES}
 	${Boost_LIBRARIES}
 	${PERFTOOLS_DEBUG_LIBRARIES}
@@ -64,7 +68,7 @@ IF(MSVC)
 	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libcd.lib")
 	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 -D_WIN32_WINNT=0x0601)
+	ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB -D_WIN32_WINNT=0x0601 -DGLOG_NO_ABBREVIATED_SEVERITIES -DGOOGLE_GLOG_DLL_DECL=)
 ENDIF()
 
 ADD_SUBDIRECTORY(Platform)

+ 3 - 3
Cpp/Platform/Mono/CMakeLists.txt

@@ -6,7 +6,7 @@ SET(MonoSrc
 )
 
 ADD_LIBRARY(Mono ${MonoSrc})
-SET_PROPERTY(TARGET Rpc PROPERTY FOLDER "Platform")
+SET_PROPERTY(TARGET Mono PROPERTY FOLDER "Platform")
 
 IF(UNIX)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MONO_CXX_FLAGS}")
@@ -22,13 +22,13 @@ ADD_CUSTOM_COMMAND(
 	DEPENDS ${MonoCsharpSrc}
 )
 
-ADD_CUSTOM_TARGET(MonoAssembly
+ADD_CUSTOM_TARGET(MonoInitTestAssembly
 	DEPENDS MonoInit.exe
 )
 
 ADD_EXECUTABLE(MonoInitTest MonoInitTest.cc)
 
-ADD_DEPENDENCIES(MonoInitTest MonoAssembly)
+ADD_DEPENDENCIES(MonoInitTest MonoInitTestAssembly)
 
 SET(Tests 
 	MonoInitTest

+ 4 - 0
Cpp/Platform/Rpc/RpcSessionTest.cc

@@ -1,6 +1,8 @@
 #include <boost/bind.hpp>
 #include <boost/asio.hpp>
 #include <gtest/gtest.h>
+#include <gflags/gflags.h>
+#include <glog/logging.h>
 #include "Rpc/RpcSession.h"
 #include "Rpc/RpcServerMock.h"
 
@@ -32,5 +34,7 @@ public:
 int main(int argc, char* argv[])
 {
 	testing::InitGoogleTest(&argc, argv);
+	google::ParseCommandLineFlags(&argc, &argv, true);
+	google::InitGoogleLogging(argv[0]);
 	return RUN_ALL_TESTS();
 }