Merge branch 'master' of cgogn:~cgogn/CGoGN

SCHNApps/CMakeLists.txt

@@ -16,7 +16,7 @@ find_package(LibXml2 REQUIRED)
 find_package(GLEW REQUIRED)
 find_package(Qt4 REQUIRED)
 find_package(QGLViewer REQUIRED)
-find_package(PythonLibs REQUIRED)
+find_package(PythonLibs 2.7 REQUIRED)
 
 SET( QT_USE_QTOPENGL TRUE )
 SET( QT_USE_QTXML TRUE )
@@ -102,6 +102,37 @@ SET(SCHNApps_ROOT_DIR ${CGoGN_ROOT_DIR}/SCHNApps)
 SET(EXECUTABLE_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/lib)
 
+
+file(
+	GLOB_RECURSE
+	SCHNApps_FILES
+	${SCHNApps_ROOT_DIR}/src/*.cpp
+	${SCHNApps_ROOT_DIR}/include/*.h
+)
+
+file(
+	GLOB_RECURSE
+	SCHNApps_UI_FILES
+	${SCHNApps_ROOT_DIR}/forms/*.ui
+)
+
+SET(SCHNApps_QOBJECT_FILES
+	${SCHNApps_ROOT_DIR}/include/camera.h
+	${SCHNApps_ROOT_DIR}/include/mapHandler.h
+	${SCHNApps_ROOT_DIR}/include/plugin.h
+	${SCHNApps_ROOT_DIR}/include/view.h
+	${SCHNApps_ROOT_DIR}/include/window.h
+	${SCHNApps_ROOT_DIR}/include/viewButtonArea.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/pluginsDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/mapsDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/cameraViewDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/pluginsViewDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/mapsViewDialog.h
+)
+
+
+
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/Release Release)
 IF (NOT WIN32)
 	ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/Debug Debug)

SCHNApps/Debug/CMakeLists.txt

@@ -16,64 +16,21 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-file(
-	GLOB
-	SCHNApps_SRC_FILES
-	${SCHNApps_ROOT_DIR}/src/main.cpp
-	${SCHNApps_ROOT_DIR}/src/camera.cpp
-	${SCHNApps_ROOT_DIR}/src/mapHandler.cpp
-	${SCHNApps_ROOT_DIR}/src/plugin.cpp
-	${SCHNApps_ROOT_DIR}/src/view.cpp
-	${SCHNApps_ROOT_DIR}/src/window.cpp
-	${SCHNApps_ROOT_DIR}/src/viewButtonArea.cpp
-	${SCHNApps_ROOT_DIR}/src/dialogs/camerasDialog.cpp
-	${SCHNApps_ROOT_DIR}/src/dialogs/pluginsDialog.cpp
-	${SCHNApps_ROOT_DIR}/src/dialogs/mapsDialog.cpp
-	${SCHNApps_ROOT_DIR}/src/dialogs/cameraViewDialog.cpp
-	${SCHNApps_ROOT_DIR}/src/dialogs/pluginsViewDialog.cpp
-	${SCHNApps_ROOT_DIR}/src/dialogs/mapsViewDialog.cpp
+QT4_WRAP_UI( UIC_FILES
+	${SCHNApps_UI_FILES}
 )
 
-SET(SCHNApps_H_OBJECT_FILES
-	${SCHNApps_ROOT_DIR}/include/camera.h
-	${SCHNApps_ROOT_DIR}/include/mapHandler.h
-	${SCHNApps_ROOT_DIR}/include/plugin.h
-	${SCHNApps_ROOT_DIR}/include/view.h
-	${SCHNApps_ROOT_DIR}/include/window.h
-	${SCHNApps_ROOT_DIR}/include/viewButtonArea.h
-	${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h
-	${SCHNApps_ROOT_DIR}/include/dialogs/pluginsDialog.h
-	${SCHNApps_ROOT_DIR}/include/dialogs/mapsDialog.h
-	${SCHNApps_ROOT_DIR}/include/dialogs/cameraViewDialog.h
-	${SCHNApps_ROOT_DIR}/include/dialogs/pluginsViewDialog.h
-	${SCHNApps_ROOT_DIR}/include/dialogs/mapsViewDialog.h
-)
-
-file(
-	GLOB
-	SCHNApps_FORM_FILES
-	${SCHNApps_ROOT_DIR}/forms/window.ui
-	${SCHNApps_ROOT_DIR}/forms/camerasDialog.ui
-	${SCHNApps_ROOT_DIR}/forms/pluginsDialog.ui
-	${SCHNApps_ROOT_DIR}/forms/mapsDialog.ui
-	${SCHNApps_ROOT_DIR}/forms/cameraViewDialog.ui
-	${SCHNApps_ROOT_DIR}/forms/pluginsViewDialog.ui
-	${SCHNApps_ROOT_DIR}/forms/mapsViewDialog.ui
-)
-
-QT4_WRAP_UI( UI_H_FILES
-	${SCHNApps_FORM_FILES}
-)
 QT4_WRAP_CPP( MOC_FILES
-	${SCHNApps_H_OBJECT_FILES}
+	${SCHNApps_QOBJECT_FILES}
 )
+
 QT4_ADD_RESOURCES( RCC_FILES
 	${SCHNApps_ROOT_DIR}/resources/resources.qrc
 )
 
 ADD_EXECUTABLE( SCHNAppsD
-	${SCHNApps_SRC_FILES}
-	${UI_H_FILES}
+	${SCHNApps_FILES}
+	${UIC_FILES}
 	${MOC_FILES}
 	${RCC_FILES}
 )

SCHNApps/Plugins/CMakeLists.txt

@@ -7,4 +7,4 @@ ADD_SUBDIRECTORY(render)
 ADD_SUBDIRECTORY(renderVector)
 ADD_SUBDIRECTORY(renderExplod)
 ADD_SUBDIRECTORY(subdivideSurface)
-ADD_SUBDIRECTORY(surfaceDeformation)
+#ADD_SUBDIRECTORY(surfaceDeformation)

SCHNApps/Plugins/differentialProperties/CMakeLists.txt

 cmake_minimum_required(VERSION 2.8)
 
+SET( PLUGIN_NAME DifferentialProperties )
+
+SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/differentialProperties )
+
 INCLUDE_DIRECTORIES(
-	${SCHNApps_ROOT_DIR}/include
-	${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/include
+	${PLUGIN_ROOT_DIR}/include
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-SET( PLUGIN_SRC
-    ${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/src/differentialProperties.cpp
-    ${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/src/computeNormalDialog.cpp
-    ${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/src/computeCurvatureDialog.cpp
+file(
+	GLOB_RECURSE
+	PLUGIN_FILES
+	${PLUGIN_ROOT_DIR}/src/*.cpp
+	${PLUGIN_ROOT_DIR}/include/*.h
+	${PLUGIN_ROOT_DIR}/include/*.hpp
 )
 
-SET( PLUGIN_H
-    ${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/include/differentialProperties.h
-    ${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/include/computeNormalDialog.h
-    ${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/include/computeCurvatureDialog.h
+file(
+	GLOB_RECURSE
+	PLUGIN_UI_FILES
+	${PLUGIN_ROOT_DIR}/forms/*.ui
 )
 
-SET( PLUGIN_FORM
-	${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/forms/computeNormalDialog.ui
-	${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/forms/computeCurvatureDialog.ui
+SET(
+	PLUGIN_QOBJECT_FILES
+	${PLUGIN_ROOT_DIR}/include/differentialProperties.h
+	${PLUGIN_ROOT_DIR}/include/computeNormalDialog.h
+	${PLUGIN_ROOT_DIR}/include/computeCurvatureDialog.h
 )
 
-IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
-
-	ADD_DEFINITIONS(-DDEBUG)
-
-	IF(WIN32)
-		link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-	ELSE (WIN32)
-		link_directories( ${CGoGN_ROOT_DIR}/lib/Debug ${CGoGN_ROOT_DIR}/lib/Release )
-	ENDIF (WIN32)
-
-	QT4_WRAP_UI( PLUGIN_UI ${PLUGIN_FORM} )
-	QT4_WRAP_CPP( PLUGIN_MOC ${PLUGIN_H} )
-	
-	ADD_LIBRARY( DifferentialPropertiesD SHARED
-		${PLUGIN_SRC}
-		${PLUGIN_UI}
-		${PLUGIN_MOC}
-	)
-
-	TARGET_LINK_LIBRARIES( DifferentialPropertiesD
-		${CGoGN_LIBS_D}
-		${COMMON_LIBS}
-	)
-
-	ADD_DEPENDENCIES( DifferentialPropertiesD SCHNAppsD )
-
-	SET_TARGET_PROPERTIES( DifferentialPropertiesD PROPERTIES COMPILE_DEFINITIONS "DEBUG" )
-		
-ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
-	
-	IF(WIN32)
-	link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-	ELSE (WIN32)
-		link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-	ENDIF (WIN32)
-
-	QT4_WRAP_UI( PLUGIN_UI ${PLUGIN_FORM} )
-	QT4_WRAP_CPP( PLUGIN_MOC ${PLUGIN_H} )
-
-	ADD_LIBRARY( DifferentialProperties SHARED
-		${PLUGIN_SRC}
-		${PLUGIN_UI}
-		${PLUGIN_MOC}
-	)
-
-	TARGET_LINK_LIBRARIES( DifferentialProperties
-		${CGoGN_LIBS_R}
-		${COMMON_LIBS}
-	)
-
-	ADD_DEPENDENCIES( DifferentialProperties SCHNApps )
-	
-ENDIF ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
+include( ${SCHNApps_ROOT_DIR}/Plugins/plugins_cmake.txt )

SCHNApps/Plugins/differentialProperties/include/differentialProperties.h

@@ -30,12 +30,12 @@ public:
 
 	virtual void redraw(View *view) {}
 
-	virtual void keyPress(View* view, int key) {}
-	virtual void keyRelease(View* view, int key) {}
-	virtual void mousePress(View* view, int button, int x, int y) {}
-	virtual void mouseRelease(View* view, int button, int x, int y) {}
-	virtual void mouseMove(View* view, int buttons, int x, int y) {}
-	virtual void wheelEvent(View* view, int delta, int x, int y) {}
+	virtual void keyPress(View* view, QKeyEvent* event) {}
+	virtual void keyRelease(View* view, QKeyEvent* event) {}
+	virtual void mousePress(View* view, QMouseEvent* event) {}
+	virtual void mouseRelease(View* view, QMouseEvent* event) {}
+	virtual void mouseMove(View* view, QMouseEvent* event) {}
+	virtual void wheelEvent(View* view, QWheelEvent* event) {}
 
 public slots:
 	void openComputeNormalDialog();

SCHNApps/Plugins/importSurface/CMakeLists.txt

 cmake_minimum_required(VERSION 2.8)
 
+SET( PLUGIN_NAME ImportSurface )
+
+SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/importSurface )
+
 INCLUDE_DIRECTORIES(
-	${SCHNApps_ROOT_DIR}/include
-	${SCHNApps_ROOT_DIR}/Plugins/importSurface
+	${PLUGIN_ROOT_DIR}/include
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-SET( PLUGIN_SRC
-    ${SCHNApps_ROOT_DIR}/Plugins/importSurface/importSurface.cpp
+file(
+	GLOB_RECURSE
+	PLUGIN_FILES
+	${PLUGIN_ROOT_DIR}/src/*.cpp
+	${PLUGIN_ROOT_DIR}/include/*.h
+	${PLUGIN_ROOT_DIR}/include/*.hpp
 )
 
-SET( PLUGIN_H
-    ${SCHNApps_ROOT_DIR}/Plugins/importSurface/importSurface.h
+file(
+	GLOB_RECURSE
+	PLUGIN_UI_FILES
+	${PLUGIN_ROOT_DIR}/forms/*.ui
 )
 
-IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
-
-	ADD_DEFINITIONS(-DDEBUG)
-
-	IF(WIN32)
-		link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-	ELSE (WIN32)
-		link_directories( ${CGoGN_ROOT_DIR}/lib/Debug ${CGoGN_ROOT_DIR}/lib/Release )
-	ENDIF (WIN32)
-
-#	QT4_WRAP_UI( PLUGIN_UI ${PLUGIN_FORM} )
-	QT4_WRAP_CPP( PLUGIN_MOC ${PLUGIN_H} )
-	
-	ADD_LIBRARY( ImportSurfaceD SHARED
-		${PLUGIN_SRC}
-		${PLUGIN_UI}
-		${PLUGIN_MOC}
-	)
-
-	TARGET_LINK_LIBRARIES( ImportSurfaceD
-		${CGoGN_LIBS_D}
-		${COMMON_LIBS}
-	)
-
-	ADD_DEPENDENCIES( ImportSurfaceD SCHNAppsD )
-
-	SET_TARGET_PROPERTIES( ImportSurfaceD PROPERTIES COMPILE_DEFINITIONS "DEBUG" )
-		
-ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
-	
-	IF(WIN32)
-	link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-	ELSE (WIN32)
-		link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-	ENDIF (WIN32)
-
-#	QT4_WRAP_UI( PLUGIN_UI ${PLUGIN_FORM} )
-	QT4_WRAP_CPP( PLUGIN_MOC ${PLUGIN_H} )
-
-	ADD_LIBRARY( ImportSurface SHARED
-		${PLUGIN_SRC}
-		${PLUGIN_UI}
-		${PLUGIN_MOC}
-	)
-
-	TARGET_LINK_LIBRARIES( ImportSurface
-		${CGoGN_LIBS_R}
-		${COMMON_LIBS}
-	)
+SET(
+	PLUGIN_QOBJECT_FILES
+	${PLUGIN_ROOT_DIR}/include/importSurface.h
+)
 
-	ADD_DEPENDENCIES( ImportSurface SCHNApps )
-	
-ENDIF ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
+include( ${SCHNApps_ROOT_DIR}/Plugins/plugins_cmake.txt )

SCHNApps/Plugins/importSurface/importSurface.h → SCHNApps/Plugins/importSurface/include/importSurface.h

@@ -27,12 +27,12 @@ public:
 
 	virtual void redraw(View *view) {}
 
-	virtual void keyPress(View* view, int key) {}
-	virtual void keyRelease(View* view, int key) {}
-	virtual void mousePress(View* view, int button, int x, int y) {}
-	virtual void mouseRelease(View* view, int button, int x, int y) {}
-	virtual void mouseMove(View* view, int buttons, int x, int y) {}
-	virtual void wheelEvent(View* view, int delta, int x, int y) {}
+	virtual void keyPress(View* view, QKeyEvent* event) {}
+	virtual void keyRelease(View* view, QKeyEvent* event) {}
+	virtual void mousePress(View* view, QMouseEvent* event) {}
+	virtual void mouseRelease(View* view, QMouseEvent* event) {}
+	virtual void mouseMove(View* view, QMouseEvent* event) {}
+	virtual void wheelEvent(View* view, QWheelEvent* event) {}
 
 public slots:
 	MapHandlerGen* importFromFile(const QString& fileName);

SCHNApps/Plugins/importVolume/CMakeLists.txt

 cmake_minimum_required(VERSION 2.8)
 
+SET( PLUGIN_NAME ImportVolume )
+
+SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/importVolume )
+
 INCLUDE_DIRECTORIES(
-	${SCHNApps_ROOT_DIR}/include
-	${SCHNApps_ROOT_DIR}/Plugins/importVolume
+	${PLUGIN_ROOT_DIR}/include
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-SET( PLUGIN_SRC
-    ${SCHNApps_ROOT_DIR}/Plugins/importVolume/importVolume.cpp
+file(
+	GLOB_RECURSE
+	PLUGIN_FILES
+	${PLUGIN_ROOT_DIR}/src/*.cpp
+	${PLUGIN_ROOT_DIR}/include/*.h
+	${PLUGIN_ROOT_DIR}/include/*.hpp
 )
 
-SET( PLUGIN_H
-    ${SCHNApps_ROOT_DIR}/Plugins/importVolume/importVolume.h
+file(
+	GLOB_RECURSE
+	PLUGIN_UI_FILES
+	${PLUGIN_ROOT_DIR}/forms/*.ui
 )
 
-IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
-
-	ADD_DEFINITIONS(-DDEBUG)
-
-	IF(WIN32)
-		link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-	ELSE (WIN32)
-		link_directories( ${CGoGN_ROOT_DIR}/lib/Debug ${CGoGN_ROOT_DIR}/lib/Release )
-	ENDIF (WIN32)
-
-#	QT4_WRAP_UI( PLUGIN_UI ${PLUGIN_FORM} )
-	QT4_WRAP_CPP( PLUGIN_MOC ${PLUGIN_H} )
-	
-	ADD_LIBRARY( ImportVolumeD SHARED
-		${PLUGIN_SRC}
-		${PLUGIN_UI}
-		${PLUGIN_MOC}
-	)
-
-	TARGET_LINK_LIBRARIES( ImportVolumeD
-		${CGoGN_LIBS_D}
-		${COMMON_LIBS}
-		${QGLVIEWER_LIBRARIES}
-	)
-
-	ADD_DEPENDENCIES( ImportVolumeD SCHNAppsD )
-
-	SET_TARGET_PROPERTIES( ImportVolumeD PROPERTIES COMPILE_DEFINITIONS "DEBUG" )
-		
-ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
-	
-	IF(WIN32)
-	link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-	ELSE (WIN32)
-		link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-	ENDIF (WIN32)
-
-#	QT4_WRAP_UI( PLUGIN_UI ${PLUGIN_FORM} )
-	QT4_WRAP_CPP( PLUGIN_MOC ${PLUGIN_H} )
-
-	ADD_LIBRARY( ImportVolume SHARED
-		${PLUGIN_SRC}
-		${PLUGIN_UI}
-		${PLUGIN_MOC}
-	)
-
-	TARGET_LINK_LIBRARIES( ImportVolume
-		${CGoGN_LIBS_R}
-		${COMMON_LIBS}
-		${QGLVIEWER_LIBRARIES}
-	)
+SET(
+	PLUGIN_QOBJECT_FILES
+	${PLUGIN_ROOT_DIR}/include/importVolume.h
+)
 
-	ADD_DEPENDENCIES( ImportVolume SCHNApps )
-	
-ENDIF ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
+include( ${SCHNApps_ROOT_DIR}/Plugins/plugins_cmake.txt )

SCHNApps/Plugins/importVolume/importVolume.h → SCHNApps/Plugins/importVolume/include/importVolume.h

@@ -27,12 +27,12 @@ public:
 
 	virtual void redraw(View *view) {}
 
-	virtual void keyPress(View* view, int key) {}
-	virtual void keyRelease(View* view, int key) {}
-	virtual void mousePress(View* view, int button, int x, int y) {}
-	virtual void mouseRelease(View* view, int button, int x, int y) {}
-	virtual void mouseMove(View* view, int buttons, int x, int y) {}
-	virtual void wheelEvent(View* view, int delta, int x, int y) {}
+	virtual void keyPress(View* view, QKeyEvent* event) {}
+	virtual void keyRelease(View* view, QKeyEvent* event) {}
+	virtual void mousePress(View* view, QMouseEvent* event) {}
+	virtual void mouseRelease(View* view, QMouseEvent* event) {}
+	virtual void mouseMove(View* view, QMouseEvent* event) {}
+	virtual void wheelEvent(View* view, QWheelEvent* event) {}
 
 public slots:
 	MapHandlerGen* importFromFile(const QString& fileName);

SCHNApps/Plugins/plugins_cmake.txt

+
+QT4_WRAP_UI( PLUGIN_UIC_FILES ${PLUGIN_UI_FILES} )
+
+QT4_WRAP_CPP( PLUGIN_MOC_FILES ${PLUGIN_QOBJECT_FILES} )
+
+IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
+
+	ADD_DEFINITIONS(-DDEBUG)
+
+	IF(WIN32)
+		link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
+	ELSE (WIN32)
+		link_directories( ${CGoGN_ROOT_DIR}/lib/Debug ${CGoGN_ROOT_DIR}/lib/Release )
+	ENDIF (WIN32)
+
+	ADD_LIBRARY( ${PLUGIN_NAME}D SHARED
+		${PLUGIN_FILES}
+		${PLUGIN_UIC_FILES}
+		${PLUGIN_MOC_FILES}
+	)
+
+	TARGET_LINK_LIBRARIES( ${PLUGIN_NAME}D
+		${CGoGN_LIBS_D}
+		${EXT_LIBS}
+	)
+
+	ADD_DEPENDENCIES( ${PLUGIN_NAME}D SCHNAppsD )
+
+	SET_TARGET_PROPERTIES( ${PLUGIN_NAME}D PROPERTIES COMPILE_DEFINITIONS "DEBUG" )
+		
+ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
+	
+	IF(WIN32)
+	link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
+	ELSE (WIN32)
+		link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
+	ENDIF (WIN32)
+
+	ADD_LIBRARY( ${PLUGIN_NAME} SHARED
+		${PLUGIN_FILES}
+		${PLUGIN_UIC_FILES}
+		${PLUGIN_MOC_FILES}
+	)
+
+	TARGET_LINK_LIBRARIES( ${PLUGIN_NAME}
+		${CGoGN_LIBS_R}
+		${EXT_LIBS}
+	)
+
+	ADD_DEPENDENCIES( ${PLUGIN_NAME} SCHNApps )
+	
+ENDIF ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )

SCHNApps/Plugins/render/CMakeLists.txt

 cmake_minimum_required(VERSION 2.8)
 
+SET( PLUGIN_NAME Render )
+
+SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/render )
+
 INCLUDE_DIRECTORIES(
-	${SCHNApps_ROOT_DIR}/include
-	${SCHNApps_ROOT_DIR}/Plugins/render
+	${PLUGIN_ROOT_DIR}/include
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-SET( PLUGIN_SRC
-    ${SCHNApps_ROOT_DIR}/Plugins/render/render.cpp
+file(
+	GLOB_RECURSE
+	PLUGIN_FILES
+	${PLUGIN_ROOT_DIR}/src/*.cpp
+	${PLUGIN_ROOT_DIR}/include/*.h
+	${PLUGIN_ROOT_DIR}/include/*.hpp
 )
 
-SET( PLUGIN_H
-    ${SCHNApps_ROOT_DIR}/Plugins/render/render.h
+file(
+	GLOB_RECURSE
+	PLUGIN_UI_FILES
+	${PLUGIN_ROOT_DIR}/forms/*.ui
 )
 
-SET( PLUGIN_FORM
-	${SCHNApps_ROOT_DIR}/Plugins/render/render.ui
+SET(
+	PLUGIN_QOBJECT_FILES
+	${PLUGIN_ROOT_DIR}/include/render.h
 )
 
-IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
-
-	ADD_DEFINITIONS(-DDEBUG)
-
-	IF(WIN32)
-		link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-	ELSE (WIN32)
-		link_directories( ${CGoGN_ROOT_DIR}/lib/Debug ${CGoGN_ROOT_DIR}/lib/Release )
-	ENDIF (WIN32)
-
-	QT4_WRAP_UI( PLUGIN_UI ${PLUGIN_FORM} )
-	QT4_WRAP_CPP( PLUGIN_MOC ${PLUGIN_H} )
-
-	ADD_LIBRARY( RenderD SHARED
-		${PLUGIN_SRC}
-		${PLUGIN_UI}
-		${PLUGIN_MOC}
-	)
-
-	TARGET_LINK_LIBRARIES( RenderD
-		${CGoGN_LIBS_D}
-		${COMMON_LIBS}
-	)
-
-	ADD_DEPENDENCIES( RenderD SCHNAppsD )
-
-	SET_TARGET_PROPERTIES( RenderD PROPERTIES COMPILE_DEFINITIONS "DEBUG" )
-		
-ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
-	
-	IF(WIN32)
-	link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-	ELSE (WIN32)
-		link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-	ENDIF (WIN32)
-
-	QT4_WRAP_UI( PLUGIN_UI ${PLUGIN_FORM} )
-	QT4_WRAP_CPP( PLUGIN_MOC ${PLUGIN_H} )
-
-	ADD_LIBRARY( Render SHARED
-		${PLUGIN_SRC}
-		${PLUGIN_UI}
-		${PLUGIN_MOC}
-	)
-
-	TARGET_LINK_LIBRARIES( Render