From 7b63c5656222dd61486498a96b3a7638c41e3075 Mon Sep 17 00:00:00 2001
From: telwertowski <telwertowski@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Tue, 9 Jan 2007 22:31:48 +0000
Subject: [PATCH] Declare all plugins and providers as MODULE rather then
 SHARED libraries for Mac compatibility.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6418 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/plugins/copyright_label/CMakeLists.txt | 2 +-
 src/plugins/delimited_text/CMakeLists.txt  | 2 +-
 src/plugins/geoprocessing/CMakeLists.txt   | 2 +-
 src/plugins/georeferencer/CMakeLists.txt   | 2 +-
 src/plugins/gps_importer/CMakeLists.txt    | 2 +-
 src/plugins/grass/CMakeLists.txt           | 2 +-
 src/plugins/grid_maker/CMakeLists.txt      | 2 +-
 src/plugins/navigation/CMakeLists.txt      | 2 +-
 src/plugins/north_arrow/CMakeLists.txt     | 2 +-
 src/plugins/scale_bar/CMakeLists.txt       | 2 +-
 src/plugins/spit/CMakeLists.txt            | 2 +-
 src/plugins/wfs/CMakeLists.txt             | 3 +--
 src/providers/delimitedtext/CMakeLists.txt | 2 +-
 src/providers/gpx/CMakeLists.txt           | 2 +-
 src/providers/grass/CMakeLists.txt         | 2 +-
 src/providers/ogr/CMakeLists.txt           | 2 +-
 src/providers/postgres/CMakeLists.txt      | 2 +-
 src/providers/wfs/CMakeLists.txt           | 2 +-
 src/providers/wms/CMakeLists.txt           | 2 +-
 19 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/plugins/copyright_label/CMakeLists.txt b/src/plugins/copyright_label/CMakeLists.txt
index 1a49d570e4df..0c4b922e1eba 100644
--- a/src/plugins/copyright_label/CMakeLists.txt
+++ b/src/plugins/copyright_label/CMakeLists.txt
@@ -22,7 +22,7 @@ QT4_WRAP_CPP (COPYRIGHT_MOC_SRCS  ${COPYRIGHT_MOC_HDRS})
 
 QT4_ADD_RESOURCES(COPYRIGHT_RCC_SRCS ${COPYRIGHT_RCCS})
 
-ADD_LIBRARY (copyrightlabelplugin SHARED ${COPYRIGHT_SRCS} ${COPYRIGHT_MOC_SRCS} ${COPYRIGHT_RCC_SRCS} ${COPYRIGHT_UIS_H})
+ADD_LIBRARY (copyrightlabelplugin MODULE ${COPYRIGHT_SRCS} ${COPYRIGHT_MOC_SRCS} ${COPYRIGHT_RCC_SRCS} ${COPYRIGHT_UIS_H})
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/plugins/delimited_text/CMakeLists.txt b/src/plugins/delimited_text/CMakeLists.txt
index cbef56c5c86d..3eac0bc956a4 100644
--- a/src/plugins/delimited_text/CMakeLists.txt
+++ b/src/plugins/delimited_text/CMakeLists.txt
@@ -25,7 +25,7 @@ QT4_WRAP_CPP (DLTEXT_MOC_SRCS  ${DLTEXT_MOC_HDRS})
 
 QT4_ADD_RESOURCES(DLTEXT_RCC_SRCS ${DLTEXT_RCCS})
 
-ADD_LIBRARY (delimitedtextplugin SHARED ${DLTEXT_SRCS} ${DLTEXT_MOC_SRCS} ${DLTEXT_RCC_SRCS} ${DLTEXT_UIS_H})
+ADD_LIBRARY (delimitedtextplugin MODULE ${DLTEXT_SRCS} ${DLTEXT_MOC_SRCS} ${DLTEXT_RCC_SRCS} ${DLTEXT_UIS_H})
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/plugins/geoprocessing/CMakeLists.txt b/src/plugins/geoprocessing/CMakeLists.txt
index 37906a999cab..7b7c9a51f8e2 100644
--- a/src/plugins/geoprocessing/CMakeLists.txt
+++ b/src/plugins/geoprocessing/CMakeLists.txt
@@ -21,7 +21,7 @@ QT4_WRAP_UI (GEOPROC_UIS_H  ${GEOPROC_UIS})
 
 QT4_WRAP_CPP (GEOPROC_MOC_SRCS  ${GEOPROC_MOC_HDRS})
 
-ADD_LIBRARY (pggeoprocessingplugin SHARED ${GEOPROC_SRCS} ${GEOPROC_MOC_SRCS} ${GEOPROC_UIS_H})
+ADD_LIBRARY (pggeoprocessingplugin MODULE ${GEOPROC_SRCS} ${GEOPROC_MOC_SRCS} ${GEOPROC_UIS_H})
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/plugins/georeferencer/CMakeLists.txt b/src/plugins/georeferencer/CMakeLists.txt
index 86e5817e1c80..70ad830e1373 100644
--- a/src/plugins/georeferencer/CMakeLists.txt
+++ b/src/plugins/georeferencer/CMakeLists.txt
@@ -40,7 +40,7 @@ QT4_WRAP_CPP (GEOREF_MOC_SRCS  ${GEOREF_MOC_HDRS})
 
 QT4_ADD_RESOURCES(GEOREF_RCC_SRCS ${GEOREF_RCCS})
 
-ADD_LIBRARY (georefplugin SHARED ${GEOREF_SRCS} ${GEOREF_MOC_SRCS} ${GEOREF_RCC_SRCS} ${GEOREF_UIS_H})
+ADD_LIBRARY (georefplugin MODULE ${GEOREF_SRCS} ${GEOREF_MOC_SRCS} ${GEOREF_RCC_SRCS} ${GEOREF_UIS_H})
 
 INCLUDE_DIRECTORIES(
      .
diff --git a/src/plugins/gps_importer/CMakeLists.txt b/src/plugins/gps_importer/CMakeLists.txt
index b05a6ebeb1d1..ad80c1e98d4f 100644
--- a/src/plugins/gps_importer/CMakeLists.txt
+++ b/src/plugins/gps_importer/CMakeLists.txt
@@ -35,7 +35,7 @@ QT4_WRAP_CPP (GPS_MOC_SRCS  ${GPS_MOC_HDRS})
 
 QT4_ADD_RESOURCES(GPS_RCC_SRCS ${GPS_RCCS})
 
-ADD_LIBRARY (gpsimporterplugin SHARED ${GPS_SRCS} ${GPS_MOC_SRCS} ${GPS_RCC_SRCS} ${GPS_UIS_H})
+ADD_LIBRARY (gpsimporterplugin MODULE ${GPS_SRCS} ${GPS_MOC_SRCS} ${GPS_RCC_SRCS} ${GPS_UIS_H})
 
 INCLUDE_DIRECTORIES(
      .
diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
index 7d3be50dab1a..12076e9bd567 100644
--- a/src/plugins/grass/CMakeLists.txt
+++ b/src/plugins/grass/CMakeLists.txt
@@ -64,7 +64,7 @@ QT4_WRAP_CPP (GRASS_PLUGIN_MOC_SRCS  ${GRASS_PLUGIN_MOC_HDRS})
 
 #QT4_ADD_RESOURCES(GRASS_PLUGIN_RCC_SRCS ${GRASS_PLUGIN_RCCS})
 
-ADD_LIBRARY (grassplugin SHARED ${GRASS_PLUGIN_SRCS} ${GRASS_PLUGIN_MOC_SRCS} ${GRASS_PLUGIN_UIS_H})
+ADD_LIBRARY (grassplugin MODULE ${GRASS_PLUGIN_SRCS} ${GRASS_PLUGIN_MOC_SRCS} ${GRASS_PLUGIN_UIS_H})
 
 INCLUDE_DIRECTORIES(
      .
diff --git a/src/plugins/grid_maker/CMakeLists.txt b/src/plugins/grid_maker/CMakeLists.txt
index 3229648db970..97de776d3aca 100644
--- a/src/plugins/grid_maker/CMakeLists.txt
+++ b/src/plugins/grid_maker/CMakeLists.txt
@@ -39,7 +39,7 @@ QT4_WRAP_CPP (GRID_MOC_SRCS  ${GRID_MOC_HDRS})
 
 QT4_ADD_RESOURCES(GRID_RCC_SRCS ${GRID_RCCS})
 
-ADD_LIBRARY (gridmakerplugin SHARED ${GRID_SRCS} ${GRID_MOC_SRCS} ${GRID_COMMON_MOC_SRCS} ${GRID_RCC_SRCS} ${GRID_UIS_H})
+ADD_LIBRARY (gridmakerplugin MODULE ${GRID_SRCS} ${GRID_MOC_SRCS} ${GRID_COMMON_MOC_SRCS} ${GRID_RCC_SRCS} ${GRID_UIS_H})
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/plugins/navigation/CMakeLists.txt b/src/plugins/navigation/CMakeLists.txt
index 0b877f785770..7d00ac67ad94 100644
--- a/src/plugins/navigation/CMakeLists.txt
+++ b/src/plugins/navigation/CMakeLists.txt
@@ -36,7 +36,7 @@ QT4_WRAP_CPP (NAVIGATION_MOC_SRCS  ${NAVIGATION_MOC_HDRS})
 
 QT4_ADD_RESOURCES(NAVIGATION_RCC_SRCS ${NAVIGATION_RCCS})
 
-ADD_LIBRARY (navigationplugin SHARED ${NAVIGATION_SRCS} ${NAVIGATION_UIS_H} ${NAVIGATION_MOC_SRCS} ${NAVIGATION_RCC_SRCS})
+ADD_LIBRARY (navigationplugin MODULE ${NAVIGATION_SRCS} ${NAVIGATION_UIS_H} ${NAVIGATION_MOC_SRCS} ${NAVIGATION_RCC_SRCS})
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/plugins/north_arrow/CMakeLists.txt b/src/plugins/north_arrow/CMakeLists.txt
index 73c0e65879d8..486fe1cbc9aa 100644
--- a/src/plugins/north_arrow/CMakeLists.txt
+++ b/src/plugins/north_arrow/CMakeLists.txt
@@ -25,7 +25,7 @@ QT4_WRAP_CPP (NORTH_MOC_SRCS  ${NORTH_MOC_HDRS})
 
 QT4_ADD_RESOURCES(NORTH_RCC_SRCS ${NORTH_RCCS})
 
-ADD_LIBRARY (northarrowplugin SHARED ${NORTH_SRCS} ${NORTH_MOC_SRCS} ${NORTH_RCC_SRCS} ${NORTH_UIS_H})
+ADD_LIBRARY (northarrowplugin MODULE ${NORTH_SRCS} ${NORTH_MOC_SRCS} ${NORTH_RCC_SRCS} ${NORTH_UIS_H})
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/plugins/scale_bar/CMakeLists.txt b/src/plugins/scale_bar/CMakeLists.txt
index 5726ffb4606c..c45330ae3ab6 100644
--- a/src/plugins/scale_bar/CMakeLists.txt
+++ b/src/plugins/scale_bar/CMakeLists.txt
@@ -25,7 +25,7 @@ QT4_WRAP_CPP (SCALE_MOC_SRCS  ${SCALE_MOC_HDRS})
 
 QT4_ADD_RESOURCES(SCALE_RCC_SRCS ${SCALE_RCCS})
 
-ADD_LIBRARY (scalebarplugin SHARED ${SCALE_SRCS} ${SCALE_MOC_SRCS} ${SCALE_RCC_SRCS} ${SCALE_UIS_H})
+ADD_LIBRARY (scalebarplugin MODULE ${SCALE_SRCS} ${SCALE_MOC_SRCS} ${SCALE_RCC_SRCS} ${SCALE_UIS_H})
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/plugins/spit/CMakeLists.txt b/src/plugins/spit/CMakeLists.txt
index 021dcb75826f..890e88060b9f 100644
--- a/src/plugins/spit/CMakeLists.txt
+++ b/src/plugins/spit/CMakeLists.txt
@@ -51,7 +51,7 @@ QT4_WRAP_CPP (SPIT_EXE_MOC_SRCS  ${SPIT_EXE_MOC_HDRS})
 
 QT4_ADD_RESOURCES(DLTEXT_RCC_SRCS ${SPIT_RCCS})
 
-ADD_LIBRARY (spitplugin SHARED ${SPIT_PLUGIN_SRCS} ${SPIT_PLUGIN_MOC_SRCS} ${SPIT_RCC_SRCS} ${SPIT_UIS_H})
+ADD_LIBRARY (spitplugin MODULE ${SPIT_PLUGIN_SRCS} ${SPIT_PLUGIN_MOC_SRCS} ${SPIT_RCC_SRCS} ${SPIT_UIS_H})
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/plugins/wfs/CMakeLists.txt b/src/plugins/wfs/CMakeLists.txt
index 05694a0dea70..edff64e89163 100644
--- a/src/plugins/wfs/CMakeLists.txt
+++ b/src/plugins/wfs/CMakeLists.txt
@@ -27,7 +27,7 @@ QT4_WRAP_CPP (WFS_MOC_SRCS  ${WFS_MOC_HDRS})
 
 #QT4_ADD_RESOURCES(WFS_RCC_SRCS ${WFS_RCCS})
 
-ADD_LIBRARY (wfsplugin SHARED ${WFS_SRCS} ${WFS_MOC_SRCS} ${WFS_UIS_H})
+ADD_LIBRARY (wfsplugin MODULE ${WFS_SRCS} ${WFS_MOC_SRCS} ${WFS_UIS_H})
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
@@ -45,7 +45,6 @@ TARGET_LINK_LIBRARIES(wfsplugin
   ${QT_LIBRARIES}
   qgis_core
   qgis_gui
-  wfsprovider
 )
 
 
diff --git a/src/providers/delimitedtext/CMakeLists.txt b/src/providers/delimitedtext/CMakeLists.txt
index af707f616aed..749a4e733e0b 100644
--- a/src/providers/delimitedtext/CMakeLists.txt
+++ b/src/providers/delimitedtext/CMakeLists.txt
@@ -15,7 +15,7 @@ INCLUDE_DIRECTORIES(
   ${GEOS_INCLUDE_DIR}
 )
 
-ADD_LIBRARY(delimitedtextprovider SHARED ${DTEXT_SRCS})
+ADD_LIBRARY(delimitedtextprovider MODULE ${DTEXT_SRCS})
 
 TARGET_LINK_LIBRARIES(delimitedtextprovider
   ${QT_LIBRARIES}
diff --git a/src/providers/gpx/CMakeLists.txt b/src/providers/gpx/CMakeLists.txt
index b8edd87a6b58..69a4e0263b91 100644
--- a/src/providers/gpx/CMakeLists.txt
+++ b/src/providers/gpx/CMakeLists.txt
@@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES(
   ${EXPAT_INCLUDE_DIR}
 )
 
-ADD_LIBRARY(gpxprovider SHARED ${OGR_SRCS})
+ADD_LIBRARY(gpxprovider MODULE ${OGR_SRCS})
 
 TARGET_LINK_LIBRARIES(gpxprovider
   ${QT_LIBRARIES}
diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
index 69720893ec0d..f46b133099b6 100644
--- a/src/providers/grass/CMakeLists.txt
+++ b/src/providers/grass/CMakeLists.txt
@@ -27,7 +27,7 @@ TARGET_LINK_LIBRARIES (qgisgrass
   qgis_core
 )
 
-ADD_LIBRARY (grassprovider SHARED ${GRASS_PROVIDER_SRCS})
+ADD_LIBRARY (grassprovider MODULE ${GRASS_PROVIDER_SRCS})
 
 TARGET_LINK_LIBRARIES (grassprovider
   ${QT_LIBRARIES}
diff --git a/src/providers/ogr/CMakeLists.txt b/src/providers/ogr/CMakeLists.txt
index 059a50b06877..be762c1fe9e8 100644
--- a/src/providers/ogr/CMakeLists.txt
+++ b/src/providers/ogr/CMakeLists.txt
@@ -8,7 +8,7 @@ INCLUDE_DIRECTORIES(
   ${GEOS_INCLUDE_DIR}
 )
 
-ADD_LIBRARY(ogrprovider SHARED ${OGR_SRCS})
+ADD_LIBRARY(ogrprovider MODULE ${OGR_SRCS})
 
 TARGET_LINK_LIBRARIES(ogrprovider
   ${QT_LIBRARIES}
diff --git a/src/providers/postgres/CMakeLists.txt b/src/providers/postgres/CMakeLists.txt
index 7cee9a151fb9..144ee8ad4cf6 100644
--- a/src/providers/postgres/CMakeLists.txt
+++ b/src/providers/postgres/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES (
   ${POSTGRES_INCLUDE_DIR}
 )
 
-ADD_LIBRARY (postgresprovider SHARED ${PG_SRCS} ${PG_MOC_SRCS})
+ADD_LIBRARY (postgresprovider MODULE ${PG_SRCS} ${PG_MOC_SRCS})
 
 TARGET_LINK_LIBRARIES (postgresprovider
   ${QT_LIBRARIES}
diff --git a/src/providers/wfs/CMakeLists.txt b/src/providers/wfs/CMakeLists.txt
index bb3984fa3625..f209a3bb60a2 100644
--- a/src/providers/wfs/CMakeLists.txt
+++ b/src/providers/wfs/CMakeLists.txt
@@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES (
   ${GEOS_INCLUDE_DIR}/geos
 )
 
-ADD_LIBRARY (wfsprovider SHARED ${WFS_SRCS})
+ADD_LIBRARY (wfsprovider MODULE ${WFS_SRCS})
 
 TARGET_LINK_LIBRARIES (wfsprovider
   ${QT_LIBRARIES}
diff --git a/src/providers/wms/CMakeLists.txt b/src/providers/wms/CMakeLists.txt
index 9269fe2d0f96..790bd44a2cb2 100644
--- a/src/providers/wms/CMakeLists.txt
+++ b/src/providers/wms/CMakeLists.txt
@@ -6,7 +6,7 @@ QT4_WRAP_CPP (WMS_MOC_SRCS ${WMS_MOC_HDRS})
 
 INCLUDE_DIRECTORIES( . ../../core)
 
-ADD_LIBRARY(wmsprovider SHARED ${WMS_SRCS} ${WMS_MOC_SRCS})
+ADD_LIBRARY(wmsprovider MODULE ${WMS_SRCS} ${WMS_MOC_SRCS})
 
 TARGET_LINK_LIBRARIES(wmsprovider
   ${QT_LIBRARIES}