@@ -22,18 +22,18 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION)
22
22
SET (GRASS_MAJOR_VERSION ${GRASS_MAJOR_VERSION${GRASS_BUILD_VERSION} })
23
23
SET (GRASS_MINOR_VERSION ${GRASS_MINOR_VERSION${GRASS_BUILD_VERSION} })
24
24
25
- QT4_WRAP_CPP(GRASS_LIBRARY_MOC_SRCS
26
- ../qgsgrass.h
27
- ../qgsgrassprovider.h
25
+ QT4_WRAP_CPP(GRASS_LIBRARY_MOC_SRCS
26
+ ../qgsgrass.h
27
+ ../qgsgrassprovider.h
28
28
../qgsgrassimport.h
29
29
../qgsgrassoptions.h
30
30
)
31
31
32
32
SET (GRASS_LIBRARY_SRCS
33
- ../qgsgrass.cpp
34
- ../qgsgrassdatafile.cpp
35
- ../qgsgrassfeatureiterator.cpp
36
- ../qgsgrassprovider.cpp
33
+ ../qgsgrass.cpp
34
+ ../qgsgrassdatafile.cpp
35
+ ../qgsgrassfeatureiterator.cpp
36
+ ../qgsgrassprovider.cpp
37
37
../qgsgrassimport.cpp
38
38
../qgsgrassoptions.cpp
39
39
)
@@ -42,8 +42,8 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION)
42
42
../qgsgrassoptionsbase.ui
43
43
)
44
44
45
- ADD_LIBRARY (qgisgrass${GRASS_BUILD_VERSION} SHARED
46
- ${GRASS_LIBRARY_SRCS}
45
+ ADD_LIBRARY (qgisgrass${GRASS_BUILD_VERSION} SHARED
46
+ ${GRASS_LIBRARY_SRCS}
47
47
${GRASS_LIBRARY_MOC_SRCS}
48
48
${GRASS_LIBRARY_UIS_H}
49
49
)
@@ -178,7 +178,7 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION)
178
178
#
179
179
ADD_EXECUTABLE (qgis.r.in${GRASS_BUILD_VERSION} ../qgis.r.in.cpp)
180
180
SET_TARGET_PROPERTIES (qgis.r.in${GRASS_BUILD_VERSION} PROPERTIES
181
- COMPILE_FLAGS "-DGRASS_BASE=\\\" ${GRASS_PREFIX} \\\" \" -DGRASS_LIB_EXPORT=${DLLEXPORT } \" \" -DGRASS_EXPORT=${DLLIMPORT} \" "
181
+ COMPILE_FLAGS "-DGRASS_BASE=\\\" ${GRASS_PREFIX} \\\" \" -DGRASS_LIB_EXPORT=${DLLIMPORT } \" \" -DGRASS_EXPORT=${DLLIMPORT} \" "
182
182
)
183
183
IF (GRASS_MAJOR_VERSION LESS 7 )
184
184
TARGET_LINK_LIBRARIES (qgis.r.in${GRASS_BUILD_VERSION}
@@ -204,7 +204,7 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION)
204
204
#
205
205
ADD_EXECUTABLE (qgis.v.in${GRASS_BUILD_VERSION} ../qgis.v.in.cpp)
206
206
SET_TARGET_PROPERTIES (qgis.v.in${GRASS_BUILD_VERSION} PROPERTIES
207
- COMPILE_FLAGS "-DGRASS_BASE=\\\" ${GRASS_PREFIX} \\\" \" -DGRASS_LIB_EXPORT=${DLLEXPORT } \" \" -DGRASS_EXPORT=${DLLIMPORT} \" "
207
+ COMPILE_FLAGS "-DGRASS_BASE=\\\" ${GRASS_PREFIX} \\\" \" -DGRASS_LIB_EXPORT=${DLLIMPORT } \" \" -DGRASS_EXPORT=${DLLIMPORT} \" "
208
208
)
209
209
TARGET_LINK_LIBRARIES (qgis.v.in${GRASS_BUILD_VERSION}
210
210
qgisgrass${GRASS_BUILD_VERSION}
@@ -233,10 +233,10 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION)
233
233
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
234
234
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR} )
235
235
236
- INSTALL (TARGETS
237
- qgis.d.rast${GRASS_BUILD_VERSION}
238
- qgis.g.info${GRASS_BUILD_VERSION}
239
- qgis.r.in${GRASS_BUILD_VERSION}
236
+ INSTALL (TARGETS
237
+ qgis.d.rast${GRASS_BUILD_VERSION}
238
+ qgis.g.info${GRASS_BUILD_VERSION}
239
+ qgis.r.in${GRASS_BUILD_VERSION}
240
240
qgis.v.in${GRASS_BUILD_VERSION}
241
241
RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR} /grass/modules
242
242
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
@@ -706,7 +706,7 @@ IF(WITH_GRASS_DIRECT)
706
706
ELSE (MSVC )
707
707
SET (FAKE_LIB_GRASS_GIS "grass_gis.${GRASS_VERSION} " )
708
708
ENDIF (MSVC )
709
- ADD_LIBRARY ( ${FAKE_LIB_GRASS_GIS} MODULE qgsgrassgislib.cpp qgsgrassgislibfunctions.cpp )
709
+ ADD_LIBRARY (${FAKE_LIB_GRASS_GIS} MODULE qgsgrassgislib.cpp qgsgrassgislibfunctions.cpp )
710
710
711
711
# GRASS_LIBRARY_gis is path to the GRASS library used for compilation, it is the same
712
712
# on runtime on Linux and Mac but on Windows with OSGEO4W the GRASS may be installed
0 commit comments