Skip to content

Commit 122259d

Browse files
author
jef
committed
build grass dlls from sources for msvc
git-svn-id: http://svn.osgeo.org/qgis/trunk@7363 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent ae95950 commit 122259d

32 files changed

+5941
-4
lines changed

cmake/FindGRASS.cmake

+11-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,17 @@ MACRO (CHECK_GRASS G_PREFIX)
2626
# LIB_PATH is only temporary variable, so hide it (is it possible to delete a variable?)
2727
MARK_AS_ADVANCED(LIB_PATH)
2828

29-
IF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES)
30-
SET (GRASS_FOUND TRUE)
31-
SET (GRASS_PREFIX ${G_PREFIX})
32-
ENDIF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES)
29+
IF (NOT MSVC)
30+
IF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES)
31+
SET (GRASS_FOUND TRUE)
32+
SET (GRASS_PREFIX ${G_PREFIX})
33+
ENDIF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES)
34+
ELSE (NOT MSVC)
35+
IF (GRASS_INCLUDE_DIR)
36+
SET (GRASS_FOUND TRUE)
37+
SET (GRASS_LIBRARIES "")
38+
ENDIF (GRASS_INCLUDE_DIR)
39+
ENDIF (NOT MSVC)
3340

3441
MARK_AS_ADVANCED (
3542
GRASS_INCLUDE_DIR

src/providers/grass/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ IF (NOT MSVC)
1717
SET_SOURCE_FILES_PROPERTIES(qgsgrassprovider.cpp PROPERTIES COMPILE_FLAGS -Wno-error )
1818
SET_SOURCE_FILES_PROPERTIES(qgsgrass.cpp PROPERTIES COMPILE_FLAGS -Wno-error )
1919
SET_SOURCE_FILES_PROPERTIES(provider.cpp PROPERTIES COMPILE_FLAGS -Wno-error )
20+
ELSE (NOT MSVC)
21+
SUBDIRS(vc)
2022
ENDIF (NOT MSVC)
2123

2224
########################################################

0 commit comments

Comments
 (0)