增加qt库检测

Egametang/CMakeLists.txt → Cpp/CMakeLists.txt

@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Cmake)
 SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
-ADD_DEFINITIONS(-O2)
+ADD_DEFINITIONS(-g)
 
 PROJECT(Cpp)
 
@@ -29,18 +29,22 @@ FIND_PACKAGE(GMock REQUIRED)
 INCLUDE_DIRECTORIES(${GMOCK_INCLUDE_DIR})
 
 FIND_PACKAGE(Protobuf REQUIRED)
-INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
 
 FIND_PACKAGE(PythonLibs REQUIRED)
-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
+
+FIND_PACKAGE(Qt4 REQUIRED)
+INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
 
 FIND_PACKAGE(Perftools REQUIRED)
+INCLUDE_DIRECTORIES(${PERFTOOLS_INCLUDE_DIR})
 
 FIND_PACKAGE(Boost REQUIRED python thread system)
 SET(Boost_USE_STATIC_LIBS    ON)
 SET(Boost_USE_MULTITHREADED  ON)
 SET(Boost_USE_STATIC_RUNTIME OFF)
-INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIR})
 
 set(ThirdPartyLibs
 	${GLOG_LIBRARIES}
@@ -50,6 +54,7 @@ set(ThirdPartyLibs
 	${PROTOBUF_LIBRARIES}
 	${Boost_LIBRARIES}
 	${PYTHON_LIBRARIES}
+	${QT_LIBRARIES}
 	${PERFTOOLS_DEBUG_LIBRARIES}
 )
 

Egametang/Platform/Python/PythonInterpreterTest.cc → Cpp/Platform/Python/PythonInterpreterTest.cc

@@ -68,7 +68,7 @@ BOOST_PYTHON_MODULE(PersonTest)
 TEST_F(PythonInterpreterTest, EnterPythonScript)
 {
 	initPersonTest();
-	interpreter.ImportPath("../../../Egametang/Platform/Python/");
+	interpreter.ImportPath("../../../Cpp/Platform/Python/");
 	interpreter.ImportModule("PythonInterpreterTest");
 
 	PersonTestPtr person(new PersonTest);

Tools/dbg.py

@@ -7,14 +7,14 @@ SAMBA_PATH = r"Z:/source/hainan"
 LINUX_PATH = "/home/tanghai/source/hainan"
 
 def main(argv):
-  os.chdir(LINUX_PATH)
-  cmd = "gdb " + ' '.join(argv[1:])
-  cmd = cmd.replace("\\", "/")
-  cmd = cmd.replace(SAMBA_PATH, ".")
-  cmd = cmd.replace("\r\n", "\n")
-  cmd = r'''sed -u -e 's/\\/\//g' | sed -u -e 's/%s/\./g' | ''' % \
-    SAMBA_PATH.replace("/", r"\/\/") + cmd
-  os.system(cmd)
+	os.chdir(LINUX_PATH)
+	cmd = "gdb " + ' '.join(argv[1:])
+	cmd = cmd.replace("\\", "/")
+	cmd = cmd.replace(SAMBA_PATH, ".")
+	cmd = cmd.replace("\r\n", "\n")
+	cmd = r'''sed -u -e 's/\\/\//g' | sed -u -e 's/%s/\./g' | ''' % \
+		SAMBA_PATH.replace("/", r"\/\/") + cmd
+	os.system(cmd)
 
 if __name__ == '__main__':
-  sys.exit(main(sys.argv))
+	sys.exit(main(sys.argv))