[QGIS Commit] r10937 - trunk/qgis/src/plugins/grass

svn_qgis at osgeo.org svn_qgis at osgeo.org
Tue Jun 16 06:11:21 EDT 2009


Author: timlinux
Date: 2009-06-16 06:11:20 -0400 (Tue, 16 Jun 2009)
New Revision: 10937

Modified:
   trunk/qgis/src/plugins/grass/CMakeLists.txt
Log:
Fix Parse error.  Function missing ending ).  Instead found left paren with text (. on line 7. Did this by separating logic for 'directory present' and 'is a directory' checks

Modified: trunk/qgis/src/plugins/grass/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/grass/CMakeLists.txt	2009-06-16 06:17:13 UTC (rev 10936)
+++ trunk/qgis/src/plugins/grass/CMakeLists.txt	2009-06-16 10:11:20 UTC (rev 10937)
@@ -4,9 +4,12 @@
   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}"))
+IF (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}")
+  MESSAGE (SEND_ERROR "Your GRASS version is not supported (${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR} is not found).")
+ENDIF (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}")
+IF (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}")
+  MESSAGE (SEND_ERROR "Your GRASS version is not supported (${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR} is not a Directory).")
+ENDIF (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${GRASS_MODULES_DIR}")
 
 SUBDIRS(modules-common ${GRASS_MODULES_DIR} scripts themes)
 



More information about the QGIS-commit mailing list