Skip to content

Commit 460a605

Browse files
committed
fix windows build
1 parent 32d7cc5 commit 460a605

File tree

4 files changed

+249
-247
lines changed

4 files changed

+249
-247
lines changed

src/providers/grass/CMakeLists.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION)
2222
SET(GRASS_MAJOR_VERSION ${GRASS_MAJOR_VERSION${GRASS_BUILD_VERSION}})
2323
SET(GRASS_MINOR_VERSION ${GRASS_MINOR_VERSION${GRASS_BUILD_VERSION}})
2424

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
2828
../qgsgrassimport.h
2929
../qgsgrassoptions.h
3030
)
3131

3232
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
3737
../qgsgrassimport.cpp
3838
../qgsgrassoptions.cpp
3939
)
@@ -42,8 +42,8 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION)
4242
../qgsgrassoptionsbase.ui
4343
)
4444

45-
ADD_LIBRARY(qgisgrass${GRASS_BUILD_VERSION} SHARED
46-
${GRASS_LIBRARY_SRCS}
45+
ADD_LIBRARY(qgisgrass${GRASS_BUILD_VERSION} SHARED
46+
${GRASS_LIBRARY_SRCS}
4747
${GRASS_LIBRARY_MOC_SRCS}
4848
${GRASS_LIBRARY_UIS_H}
4949
)
@@ -178,7 +178,7 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION)
178178
#
179179
ADD_EXECUTABLE(qgis.r.in${GRASS_BUILD_VERSION} ../qgis.r.in.cpp)
180180
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}\""
182182
)
183183
IF (GRASS_MAJOR_VERSION LESS 7 )
184184
TARGET_LINK_LIBRARIES(qgis.r.in${GRASS_BUILD_VERSION}
@@ -204,7 +204,7 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION)
204204
#
205205
ADD_EXECUTABLE(qgis.v.in${GRASS_BUILD_VERSION} ../qgis.v.in.cpp)
206206
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}\""
208208
)
209209
TARGET_LINK_LIBRARIES(qgis.v.in${GRASS_BUILD_VERSION}
210210
qgisgrass${GRASS_BUILD_VERSION}
@@ -233,10 +233,10 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION)
233233
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
234234
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
235235

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}
240240
qgis.v.in${GRASS_BUILD_VERSION}
241241
RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR}/grass/modules
242242
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
@@ -706,7 +706,7 @@ IF(WITH_GRASS_DIRECT)
706706
ELSE(MSVC)
707707
SET (FAKE_LIB_GRASS_GIS "grass_gis.${GRASS_VERSION}")
708708
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 )
710710

711711
# GRASS_LIBRARY_gis is path to the GRASS library used for compilation, it is the same
712712
# on runtime on Linux and Mac but on Windows with OSGEO4W the GRASS may be installed

0 commit comments

Comments
 (0)