Moved default.qgc into modules directory to make the modules tree and…

… search GRASS version dependent git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10930 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jun 15, 2009 · c11d663 · c11d663
1 parent 78e945e
commit c11d663
Show file tree

Hide file tree

Showing 7 changed files with 460 additions and 9 deletions.
diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -1,5 +1,14 @@
-SET (GRASS_MODULES_DIR "modules-${GRASS_MAJOR_VERSION}.${GRASS_MINOR_VERSION}")
-SUBDIRS(config modules-common ${GRASS_MODULES_DIR} scripts themes)
+IF (GRASS_NUM_VERSION LESS 60300)
+  SET (GRASS_MODULES_DIR "modules-6.3")
+ELSE (GRASS_NUM_VERSION LESS 60300)
+  SET (GRASS_MODULES_DIR "modules-${GRASS_MAJOR_VERSION}.${GRASS_MINOR_VERSION}")
+ENDIF (GRASS_NUM_VERSION LESS 60300)
+
+IF (NOT (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}" AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}"))
+  MESSAGE (SEND_ERROR "Your GRASS version is not supported.")
+ENDIF (NOT (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}" AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}"))
+
+SUBDIRS(modules-common ${GRASS_MODULES_DIR} scripts themes)
 
 ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
 ADD_DEFINITIONS(-DHAVE_OPENPTY=${HAVE_OPENPTY})

diff --git a/src/plugins/grass/config/.cvsignore b/src/plugins/grass/config/.cvsignore
diff --git a/src/plugins/grass/config/CMakeLists.txt b/src/plugins/grass/config/CMakeLists.txt
diff --git a/src/plugins/grass/modules-6.3/CMakeLists.txt b/src/plugins/grass/modules-6.3/CMakeLists.txt
@@ -2,3 +2,6 @@ FILE (GLOB MODULE_FILES *.qgm *.svg *.png)
 INSTALL (FILES ${MODULE_FILES}
          DESTINATION ${QGIS_DATA_DIR}/grass/modules)
 
+FILE (GLOB CONFIG *.qgc)
+INSTALL (FILES ${CONFIG}
+         DESTINATION ${QGIS_DATA_DIR}/grass/config)