Mercurial > ldforge / file diff

--- a/CMakeLists.txt	Sun Apr 12 23:02:26 2015 +0300
+++ b/CMakeLists.txt	Tue Jul 07 21:35:20 2015 +0300
@@ -30,6 +30,7 @@
 	src/actionsEdit.cpp
 	src/addObjectDialog.cpp
 	src/basics.cpp
+	src/boundingbox.cpp
 	src/colors.cpp
 	src/colorSelector.cpp
 	src/configuration.cpp
@@ -54,6 +55,7 @@
 	src/radioGroup.cpp
 	src/ringFinder.cpp
 	src/version.cpp
+	src/vertex.cpp
 	src/editmodes/abstractEditMode.cpp
 	src/editmodes/circleMode.cpp
 	src/editmodes/drawMode.cpp
@@ -90,6 +92,8 @@
 	src/mainWindow.h
 	src/editHistory.h
 	src/format.h
+	src/boundingbox.h
+	src/vertex.h
 	src/editmodes/abstractEditMode.h
 	src/editmodes/circleMode.h
 	src/editmodes/drawMode.h
@@ -155,19 +159,19 @@
 endif()
 
 if (USE_QT5)
-	qt5_generate_moc (LDFORGE_MOC ${LDFORGE_HEADERS})
 	qt5_add_resources (LDFORGE_QRC ${LDFORGE_RESOURCES})
 	qt5_wrap_ui (LDFORGE_FORMS_HEADERS ${LDFORGE_FORMS})
-	add_executable (${PROJECT_NAME} WIN32 ${LDFORGE_SOURCES} ${LDFORGE_MOC}
-		${LDFORGE_QRC} ${LDFORGE_FORMS_HEADERS})
+	add_executable (${PROJECT_NAME} WIN32 ${LDFORGE_SOURCES}
+		${LDFORGE_QRC} ${LDFORGE_FORMS_HEADERS} ${LDFORGE_HEADERS})
 else()
-	qt4_wrap_cpp (LDFORGE_MOC ${LDFORGE_HEADERS})
 	qt4_wrap_ui (LDFORGE_FORMS_HEADERS ${LDFORGE_FORMS})
 	qt4_add_resources (LDFORGE_RCC ${LDFORGE_RESOURCES})
-	add_executable (${PROJECT_NAME} WIN32 ${LDFORGE_SOURCES} ${LDFORGE_RCC}
-		${LDFORGE_FORMS_HEADERS} ${LDFORGE_MOC})
+	add_executable (${PROJECT_NAME} WIN32 ${LDFORGE_SOURCES}
+		${LDFORGE_FORMS_HEADERS} ${LDFORGE_MOC} ${LDFORGE_HEADERS})
 endif()
 
+set_target_properties (${PROJECT_NAME} PROPERTIES AUTOMOC 1)
+
 if (USE_QT5)
 	target_link_libraries (${PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::OpenGL ${OPENGL_LIBRARIES})
 else()