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

test project建立相应的目录filter

tanghai 14 лет назад
Родитель
Сommit
7957dbb1c1

+ 7 - 4
Cpp/CMakeLists.txt

@@ -2,9 +2,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.4)
 
 SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
 SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Cmake)
-SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
-IF(NOT CMAKE_BUILD_TYPE )
-	SET(CMAKE_BUILD_TYPE "Debug")
+SET(CMAKE_USE_RELATIVE_PATHS ON)
+IF(NOT CMAKE_BUILD_TYPE)
+	SET(CMAKE_BUILD_TYPE Debug)
 ENDIF()
 
 PROJECT(Cpp)
@@ -25,15 +25,18 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ThirdParty)
 
 FIND_PACKAGE(Protobuf REQUIRED)
 INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+LINK_DIRECTORIES(${PROTOBUF_LIBRARY_DIR})
 
 FIND_PACKAGE(Perftools REQUIRED)
 INCLUDE_DIRECTORIES(${PERFTOOLS_INCLUDE_DIR})
+LINK_DIRECTORIES(${PERFTOOLS_LIBRARY_DIR})
 
 FIND_PACKAGE(Boost REQUIRED thread system)
 SET(Boost_USE_STATIC_LIBS    ON)
 SET(Boost_USE_MULTITHREADED  ON)
 SET(Boost_USE_STATIC_RUNTIME OFF)
 INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIR})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIR})
 
 SET(ThirdPartyLibs
 	gtest
@@ -44,7 +47,7 @@ SET(ThirdPartyLibs
 )
 
 IF(PROFILE)
-    SET(ThirdPartyLibs ${ThirdPartyLibs} ${PERFTOOLS_PROFILE_LIBRARIES})
+	SET(ThirdPartyLibs ${ThirdPartyLibs} ${PERFTOOLS_PROFILE_LIBRARIES})
 ENDIF()
 
 MESSAGE(STATUS "${ThirdPartyLibs}")

+ 2 - 1
Cpp/Game/BehaviorTree/CMakeLists.txt

@@ -20,6 +20,7 @@ SET(BehaviorTreeSrc
 )
 
 ADD_LIBRARY(BehaviorTree ${BehaviorTreeSrc})
+SET_PROPERTY(TARGET BehaviorTree PROPERTY FOLDER "Game")
 
 ADD_EXECUTABLE(GameEventsTest GameEventsTest.cc)
 
@@ -33,5 +34,5 @@ FOREACH(Test ${Tests})
 		${ThirdPartyLibs}
 	)
 	ADD_TEST(${Test} ${Test})
-	SET_PROPERTY(TARGET ${Test} PROPERTY FOLDER "Tests")
+	SET_PROPERTY(TARGET ${Test} PROPERTY FOLDER "Tests/Game/BehaviorTree")
 ENDFOREACH()

+ 2 - 1
Cpp/Platform/Python/CMakeLists.txt

@@ -7,6 +7,7 @@ SET(PythonSrc
 )
 
 ADD_LIBRARY(PythonInterpreter ${PythonSrc})
+SET_PROPERTY(TARGET PythonInterpreter PROPERTY FOLDER "Platform/Python")
 
 ADD_EXECUTABLE(PythonInitTest PythonInitTest.cc)
 ADD_EXECUTABLE(PythonInterpreterTest PythonInterpreterTest.cc)
@@ -22,5 +23,5 @@ FOREACH(Test ${Tests})
 		${ThirdPartyLibs}
 	)
 	ADD_TEST(${Test} ${Test})
-	SET_PROPERTY(TARGET ${Test} PROPERTY FOLDER "Tests")
+	SET_PROPERTY(TARGET ${Test} PROPERTY FOLDER "Tests/Platform/Python")
 ENDFOREACH()

+ 2 - 1
Cpp/Platform/Rpc/CMakeLists.txt

@@ -19,6 +19,7 @@ SET(RpcSrc
 
 
 ADD_LIBRARY(Rpc ${RpcSrc})
+SET_PROPERTY(TARGET Rpc PROPERTY FOLDER "Platform")
 
 ADD_EXECUTABLE(RpcCommunicatorTest RpcCommunicatorTest.cc)
 ADD_EXECUTABLE(RpcClientTest RpcClientTest.cc)
@@ -39,5 +40,5 @@ FOREACH(Test ${Tests})
 		${ThirdPartyLibs}
 	)
 	ADD_TEST(${Test} ${Test})
-	SET_PROPERTY(TARGET ${Test} PROPERTY FOLDER "Tests")
+	SET_PROPERTY(TARGET ${Test} PROPERTY FOLDER "Tests/Platform/Rpc")
 ENDFOREACH()

+ 1 - 1
Cpp/Platform/Rpc/RequestHandler.cc

@@ -10,7 +10,7 @@ RequestHandler::RequestHandler(
 
 google::protobuf::Message *RequestHandler::Response() const
 {
-    return response;
+	return response;
 }
 
 void RequestHandler::Run()

+ 2 - 1
Cpp/Platform/Thread/CMakeLists.txt

@@ -7,6 +7,7 @@ SET(ThreadSrc
 )
 
 ADD_LIBRARY(Thread ${ThreadSrc})
+SET_PROPERTY(TARGET Thread PROPERTY FOLDER "Platform")
 
 ADD_EXECUTABLE(ThreadPoolTest ThreadPoolTest.cc)
 ADD_EXECUTABLE(CountBarrierTest CountBarrierTest.cc)
@@ -22,5 +23,5 @@ FOREACH(Test ${Tests})
 		${ThirdPartyLibs}
 	)
 	ADD_TEST(${Test} ${Test})
-	SET_PROPERTY(TARGET ${Test} PROPERTY FOLDER "Tests")
+	SET_PROPERTY(TARGET ${Test} PROPERTY FOLDER "Tests/Platform/Thread")
 ENDFOREACH()