增加QT Cmake

Cpp/CMakeLists.txt

@@ -3,8 +3,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Cmake)
 SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
-ADD_DEFINITIONS(-g)
-
 PROJECT(Cpp)
 
 OPTION(BUILD_TESTS "Decide if the test suite shall be built or not" ON)
@@ -36,8 +34,8 @@ INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
 FIND_PACKAGE(PythonLibs REQUIRED)
 INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
 
-#FIND_PACKAGE(Qt4 REQUIRED)
-#INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
+FIND_PACKAGE(Qt4 REQUIRED)
+INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
 
 FIND_PACKAGE(Perftools REQUIRED)
 INCLUDE_DIRECTORIES(${PERFTOOLS_INCLUDE_DIR})
@@ -61,4 +59,5 @@ set(ThirdPartyLibs
 )
 
 ADD_SUBDIRECTORY(Platform)
-ADD_SUBDIRECTORY(Game)
+ADD_SUBDIRECTORY(Game)
+ADD_SUBDIRECTORY(Editor)

Cpp/Editor/CMakeLists.txt

@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(Ui)

Cpp/Editor/Ui/CMakeLists.txt

@@ -0,0 +1,7 @@
+INCLUDE(${QT_USE_FILE})
+
+ADD_EXECUTABLE(Main Main.cc)
+
+TARGET_LINK_LIBRARIES(Main
+	${QT_LIBRARIES}
+	)

Cpp/Editor/Ui/Main.cc

@@ -0,0 +1,9 @@
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+
+int main(int argc, char** argv)
+{
+	QCoreApplication app(argc, argv);
+	qDebug() << "hello qt!";
+	return app.exec();
+}

Cpp/Editor/Main.ui → Cpp/Editor/Ui/Main.ui

@@ -28,7 +28,7 @@
      <x>0</x>
      <y>0</y>
      <width>1024</width>
-     <height>28</height>
+     <height>23</height>
     </rect>
    </property>
   </widget>

Cpp/Game/BehaviorTree/GameEventsTest.cc

@@ -40,7 +40,7 @@ static void FileToString(const std::string& file, std::string& string)
 
 TEST_F(GameEventsTest, Vampire)
 {
-	std::string file = "../Cpp/Game/BehaviorTree/Vampire.txt";
+	std::string file = "../../../Cpp/Game/BehaviorTree/Vampire.txt";
 	std::string string;
 	FileToString(file, string);
 	BehaviorTreeConf conf;