Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed GRASS configuration on Windows
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6656 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Feb 22, 2007
1 parent 0766775 commit c9c5d09
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions cmake/FindGRASS.cmake
Expand Up @@ -39,7 +39,7 @@ ENDMACRO (CHECK_GRASS)
# search for grass installations

# list of paths which to search - user's choice as first
SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass c:/msys/local/grass-6.3.cvs)
SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass c:/msys/local)

# mac-specific path
IF (APPLE)
Expand All @@ -60,9 +60,14 @@ ENDIF (WITH_GRASS)

IF (GRASS_FOUND)

# read grass version number and remove trailing newline
FILE (READ ${GRASS_PREFIX}/etc/VERSIONNUMBER GRASS_VERSION)
STRING(REPLACE "\n" "" GRASS_VERSION ${GRASS_VERSION})
IF (NOT WIN32)
# read grass version number and remove trailing newline
FILE (READ ${GRASS_PREFIX}/etc/VERSIONNUMBER GRASS_VERSION)
STRING(REPLACE "\n" "" GRASS_VERSION ${GRASS_VERSION})
ELSE (NOT WIN32)
# TODO: how to find out grass version on win?
SET(GRASS_VERSION "?")
ENDIF (NOT WIN32)

IF (NOT GRASS_FIND_QUIETLY)
MESSAGE(STATUS "Found GRASS: ${GRASS_PREFIX} (${GRASS_VERSION})")
Expand Down

0 comments on commit c9c5d09

Please sign in to comment.