Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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@10930 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
rugginoso committed Jun 15, 2009
1 parent 66fde8f commit 6e0dc29
Show file tree
Hide file tree
Showing 7 changed files with 460 additions and 9 deletions.
13 changes: 11 additions & 2 deletions 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})
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/grass/config/.cvsignore

This file was deleted.

5 changes: 0 additions & 5 deletions src/plugins/grass/config/CMakeLists.txt

This file was deleted.

3 changes: 3 additions & 0 deletions src/plugins/grass/modules-6.3/CMakeLists.txt
Expand Up @@ -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)

0 comments on commit 6e0dc29

Please sign in to comment.