调整了cmake脚本,每个test单独设置链接库

Cpp/Platform/Log/CMakeLists.txt

@@ -10,15 +10,9 @@ SET_PROPERTY(TARGET Log PROPERTY FOLDER "Platform")
 
 ADD_EXECUTABLE(LogTest LogTest.cc)
 
-SET(Tests
-	LogTest
+TARGET_LINK_LIBRARIES(LogTest
+	Log
+	${ThirdPartyLibs}
 )
-
-FOREACH(Test ${Tests})
-	TARGET_LINK_LIBRARIES(${Test}
-		Log
-		${ThirdPartyLibs}
-	)
-	ADD_TEST(${Test} ${Test})
-	SET_PROPERTY(TARGET ${Test} PROPERTY FOLDER "Tests/Platform/Log")
-ENDFOREACH()
+ADD_TEST(LogTest LogTest)
+SET_PROPERTY(TARGET LogTest PROPERTY FOLDER "Tests/Platform/Log")

Cpp/Platform/Rpc/CMakeLists.txt

@@ -5,9 +5,9 @@ PROTOBUF_GENERATE_CPP(ProtoSrcs ProtoHdrs
 FILE(GLOB Header "*.h")
 
 SET(RpcSrc 
-	${Header}
 	${ProtoHdrs}
 	${ProtoSrcs}
+	${Header}
 	MethodInfo.cc
 	RpcCommunicator.cc
 	RpcController.cc
@@ -27,20 +27,11 @@ ADD_EXECUTABLE(RpcCommunicatorTest RpcCommunicatorTest.cc)
 #ADD_EXECUTABLE(RpcSessionTest RpcSessionTest.cc)
 #ADD_EXECUTABLE(RpcServerTest RpcServerTest.cc)
 
-SET(Tests 
-	RpcCommunicatorTest
-#	RpcClientTest
-#	RpcSessionTest
-#	RpcServerTest
+TARGET_LINK_LIBRARIES(RpcCommunicatorTest
+	Log
+	Rpc
+	Thread
+	${ThirdPartyLibs}
 )
-
-FOREACH(Test ${Tests})
-	TARGET_LINK_LIBRARIES(${Test}
-		Log
-		Rpc
-		Thread
-		${ThirdPartyLibs}
-	)
-	ADD_TEST(${Test} ${Test})
-	SET_PROPERTY(TARGET ${Test} PROPERTY FOLDER "Tests/Platform/Rpc")
-ENDFOREACH()
+ADD_TEST(RpcCommunicatorTest RpcCommunicatorTest)
+SET_PROPERTY(TARGET RpcCommunicatorTest PROPERTY FOLDER "Tests/Platform/Rpc")

Cpp/Platform/Thread/CMakeLists.txt

@@ -10,15 +10,9 @@ SET_PROPERTY(TARGET Thread PROPERTY FOLDER "Platform")
 
 ADD_EXECUTABLE(CountBarrierTest CountBarrierTest.cc)
 
-SET(Tests 
-	CountBarrierTest
+TARGET_LINK_LIBRARIES(CountBarrierTest
+	Thread
+	${ThirdPartyLibs}
 )
-
-FOREACH(Test ${Tests})
-	TARGET_LINK_LIBRARIES(${Test}
-		Thread
-		${ThirdPartyLibs}
-	)
-	ADD_TEST(${Test} ${Test})
-	SET_PROPERTY(TARGET ${Test} PROPERTY FOLDER "Tests/Platform/Thread")
-ENDFOREACH()
+ADD_TEST(CountBarrierTest CountBarrierTest)
+SET_PROPERTY(TARGET CountBarrierTest PROPERTY FOLDER "Tests/Platform/Thread")