Skip to content

Commit 6e0dc29

Browse files
author
rugginoso
committedJun 15, 2009
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
·
ltr-3_40Before-merge-new_vector_api
1 parent 66fde8f commit 6e0dc29

File tree

7 files changed

+460
-9
lines changed

7 files changed

+460
-9
lines changed
 

‎src/plugins/grass/CMakeLists.txt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
SET (GRASS_MODULES_DIR "modules-${GRASS_MAJOR_VERSION}.${GRASS_MINOR_VERSION}")
2-
SUBDIRS(config modules-common ${GRASS_MODULES_DIR} scripts themes)
1+
IF (GRASS_NUM_VERSION LESS 60300)
2+
SET (GRASS_MODULES_DIR "modules-6.3")
3+
ELSE (GRASS_NUM_VERSION LESS 60300)
4+
SET (GRASS_MODULES_DIR "modules-${GRASS_MAJOR_VERSION}.${GRASS_MINOR_VERSION}")
5+
ENDIF (GRASS_NUM_VERSION LESS 60300)
6+
7+
IF (NOT (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}" AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}"))
8+
MESSAGE (SEND_ERROR "Your GRASS version is not supported.")
9+
ENDIF (NOT (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}" AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}"))
10+
11+
SUBDIRS(modules-common ${GRASS_MODULES_DIR} scripts themes)
312

413
ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
514
ADD_DEFINITIONS(-DHAVE_OPENPTY=${HAVE_OPENPTY})

‎src/plugins/grass/config/.cvsignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/plugins/grass/config/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/plugins/grass/modules-6.3/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ FILE (GLOB MODULE_FILES *.qgm *.svg *.png)
22
INSTALL (FILES ${MODULE_FILES}
33
DESTINATION ${QGIS_DATA_DIR}/grass/modules)
44

5+
FILE (GLOB CONFIG *.qgc)
6+
INSTALL (FILES ${CONFIG}
7+
DESTINATION ${QGIS_DATA_DIR}/grass/config)

‎src/plugins/grass/modules-6.3/default.qgc

Lines changed: 443 additions & 0 deletions
Large diffs are not rendered by default.

‎src/plugins/grass/modules-6.4/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ FILE (GLOB MODULE_FILES *.qgm *.svg *.png)
22
INSTALL (FILES ${MODULE_FILES}
33
DESTINATION ${QGIS_DATA_DIR}/grass/modules)
44

5+
FILE (GLOB CONFIG *.qgc)
6+
INSTALL (FILES ${CONFIG}
7+
DESTINATION ${QGIS_DATA_DIR}/grass/config)

0 commit comments

Comments
 (0)
Please sign in to comment.