SCHNApps: update plugins CMakeLists

SCHNApps/CMakeLists.txt

@@ -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/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/renderVector/CMakeLists.txt

 cmake_minimum_required(VERSION 2.8)
 
+SET( PLUGIN_NAME RenderVector )
+
+SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/renderVector )
+
 INCLUDE_DIRECTORIES(
-	${SCHNApps_ROOT_DIR}/include
-	${SCHNApps_ROOT_DIR}/Plugins/renderVector
+	${PLUGIN_ROOT_DIR}/include
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-SET( PLUGIN_SRC
-    ${SCHNApps_ROOT_DIR}/Plugins/renderVector/renderVector.cpp
+file(
+	GLOB_RECURSE
+	PLUGIN_FILES
+	${PLUGIN_ROOT_DIR}/src/*.cpp
+	${PLUGIN_ROOT_DIR}/include/*.h
 )
 
-SET( PLUGIN_H
-    ${SCHNApps_ROOT_DIR}/Plugins/renderVector/renderVector.h
+file(
+	GLOB_RECURSE
+	PLUGIN_UI_FILES
+	${PLUGIN_ROOT_DIR}/forms/*.ui
 )
 
-SET( PLUGIN_FORM
-	${SCHNApps_ROOT_DIR}/Plugins/renderVector/renderVector.ui
+SET(
+	PLUGIN_QOBJECT_FILES
+    ${SCHNApps_ROOT_DIR}/Plugins/renderVector/renderVector.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( RenderVectorD SHARED
-		${PLUGIN_SRC}
-		${PLUGIN_UI}
-		${PLUGIN_MOC}
-	)
-
-	TARGET_LINK_LIBRARIES( RenderVectorD
-		${CGoGN_LIBS_D}
-		${COMMON_LIBS}
-	)
-
-	ADD_DEPENDENCIES( RenderVectorD SCHNAppsD )
-
-	SET_TARGET_PROPERTIES( RenderVectorD 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( RenderVector SHARED
-		${PLUGIN_SRC}
-		${PLUGIN_UI}
-		${PLUGIN_MOC}
-	)
-
-	TARGET_LINK_LIBRARIES( RenderVector
-		${CGoGN_LIBS_R}
-		${COMMON_LIBS}
-	)
-
-	ADD_DEPENDENCIES( RenderVector SCHNApps )
-	
-ENDIF ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
+include( ${SCHNApps_ROOT_DIR}/Plugins/plugins_cmake.txt )

SCHNApps/Release/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( SCHNApps
-	${SCHNApps_SRC_FILES}
-	${UI_H_FILES}
+	${SCHNApps_FILES}
+	${UIC_FILES}
 	${MOC_FILES}
 	${RCC_FILES}
 )