Skip to content
Permalink
Browse files

fix for grass dlls in msvc build

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7366 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Nov 10, 2007
1 parent b7e8022 commit e7b057d86d01b60172f8975d1d75caab3ff3242a
@@ -19,6 +19,20 @@ IF (NOT MSVC)
SET_SOURCE_FILES_PROPERTIES(provider.cpp PROPERTIES COMPILE_FLAGS -Wno-error )
ELSE (NOT MSVC)
SUBDIRS(vc)

SET(GRASS_LIBRARIES
${GRASS_LIBRARIES}
grass_gis
grass_vect
grass_gproj
grass_dbmibase
grass_dbmiclient
grass_linkm
grass_dig2
grass_dgl
xdr
${GDAL_LIBRARY}
)
ENDIF (NOT MSVC)

########################################################
@@ -342,13 +342,14 @@ ADD_LIBRARY(grass_dgl SHARED
SET_TARGET_PROPERTIES(grass_dgl PROPERTIES LINK_FLAGS "/def:${CMAKE_CURRENT_SOURCE_DIR}/grass_dgl.def")

ADD_LIBRARY (grass_gproj SHARED
${GRASS_PREFIX}/lib/proj/convert.c
${GRASS_PREFIX}/lib/proj/datum.c
${GRASS_PREFIX}/lib/proj/do_proj.c
${GRASS_PREFIX}/lib/proj/ellipse.c
${GRASS_PREFIX}/lib/proj/get_proj.c
)
SET_TARGET_PROPERTIES(grass_gproj PROPERTIES LINK_FLAGS "/def:${CMAKE_CURRENT_SOURCE_DIR}/grass_gproj.def")
TARGET_LINK_LIBRARIES(grass_gproj grass_gis grass_rtree grass_dig2 ${PROJ_LIBRARY})
TARGET_LINK_LIBRARIES(grass_gproj grass_gis grass_rtree grass_dig2 ${PROJ_LIBRARY} ${GDAL_LIBRARY})

ADD_LIBRARY (grass_dbmibase SHARED
${GRASS_PREFIX}/lib/db/dbmi_base/alloc.c
@@ -451,20 +452,6 @@ ADD_LIBRARY (grass_dbmiclient SHARED
SET_TARGET_PROPERTIES(grass_dbmiclient PROPERTIES LINK_FLAGS "/def:${CMAKE_CURRENT_SOURCE_DIR}/grass_dbmiclient.def")
TARGET_LINK_LIBRARIES(grass_dbmiclient grass_dbmibase)

SET(GRASS_LIBRARIES
${GRASS_LIBRARIES}
grass_gis
grass_vect
grass_proj
grass_dbmibase
grass_dbmiclient
grass_linkm
grass_dig2
grass_dgl
xdr
${GDAL_LIBRARY}
)

INSTALL(TARGETS
grass_gis
grass_vect
@@ -12,11 +12,11 @@ GPJ_get_default_datum_params_by_name
GPJ_get_ellipsoid_by_name
GPJ_get_ellipsoid_params
GPJ_get_equivalent_latlong
;GPJ_grass_to_osr
;GPJ_grass_to_wkt
;GPJ_osr_to_grass
;GPJ_set_csv_loc
;GPJ_wkt_to_grass
GPJ_grass_to_osr
GPJ_grass_to_wkt
GPJ_osr_to_grass
GPJ_set_csv_loc
GPJ_wkt_to_grass
free_datum_list
free_ellps_list
pj_do_proj

0 comments on commit e7b057d

Please sign in to comment.
You can’t perform that action at this time.