diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ce2fb9d5..b5b6ffca9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -231,12 +231,12 @@ endif()
 
 if(USE_PROJ)
     #https://proj.org/development/cmake.html
-    mapnik_find_package(PROJ REQUIRED)
-    math(EXPR MAPNIK_PROJ_VERSION "${PROJ_VERSION_MAJOR}*10000 + ${PROJ_VERSION_MINOR}*100 + ${PROJ_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL)
+    mapnik_find_package(PROJ4 REQUIRED)
+    math(EXPR MAPNIK_PROJ_VERSION "${PROJ4_VERSION_MAJOR}*10000 + ${PROJ4_VERSION_MINOR}*100 + ${PROJ4_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL)
     message(STATUS "Using mapnik PROJ version: ${MAPNIK_PROJ_VERSION}")
     list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_USE_PROJ MAPNIK_PROJ_VERSION=${MAPNIK_PROJ_VERSION})
-    list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES})
-    list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS})
+    list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ4_LIBRARIES})
+    list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ4_INCLUDE_DIRS})
 endif()
 
 if(USE_GRID_RENDERER)
diff --git a/plugins/input/csv/CMakeLists.txt b/plugins/input/csv/CMakeLists.txt
index 3d251a5ea..ecf4edda6 100644
--- a/plugins/input/csv/CMakeLists.txt
+++ b/plugins/input/csv/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(input-csv)
 
-add_library(input-csv SHARED
+add_library(input-csv MODULE
     csv_datasource.cpp
     csv_featureset.cpp
     csv_index_featureset.cpp
@@ -18,10 +18,5 @@ target_link_libraries(input-csv PRIVATE
 set_target_properties(input-csv PROPERTIES PREFIX "")
 set_target_properties(input-csv PROPERTIES OUTPUT_NAME "csv")
 set_target_properties(input-csv PROPERTIES SUFFIX ".input")
-#install(TARGETS input-csv DESTINATION bin/plugins/input)
-
-install(TARGETS input-csv 
-    RUNTIME DESTINATION ${PLUGINS_INSTALL_DIR}
-)
 
 mapnik_install(TARGET input-csv IS_PLUGIN)
diff --git a/plugins/input/gdal/CMakeLists.txt b/plugins/input/gdal/CMakeLists.txt
index 92b305766..0bba721cc 100644
--- a/plugins/input/gdal/CMakeLists.txt
+++ b/plugins/input/gdal/CMakeLists.txt
@@ -2,7 +2,7 @@ project(input-gdal)
 
 find_package(GDAL REQUIRED)
 
-add_library(input-gdal SHARED
+add_library(input-gdal MODULE
     gdal_datasource.cpp
     gdal_featureset.cpp
 )
diff --git a/plugins/input/geobuf/CMakeLists.txt b/plugins/input/geobuf/CMakeLists.txt
index bb5fef85e..56a027aeb 100644
--- a/plugins/input/geobuf/CMakeLists.txt
+++ b/plugins/input/geobuf/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(input-geobuf)
 
-add_library(input-geobuf SHARED
+add_library(input-geobuf MODULE
     geobuf_datasource.cpp
     geobuf_featureset.cpp
 )
diff --git a/plugins/input/geojson/CMakeLists.txt b/plugins/input/geojson/CMakeLists.txt
index 39b392fe5..6f830e13b 100644
--- a/plugins/input/geojson/CMakeLists.txt
+++ b/plugins/input/geojson/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(input-geojson)
 
-add_library(input-geojson SHARED 
+add_library(input-geojson MODULE 
     geojson_datasource.cpp 
     geojson_featureset.cpp 
     geojson_index_featureset.cpp 
diff --git a/plugins/input/ogr/CMakeLists.txt b/plugins/input/ogr/CMakeLists.txt
index 0791c093b..c8fd113de 100644
--- a/plugins/input/ogr/CMakeLists.txt
+++ b/plugins/input/ogr/CMakeLists.txt
@@ -2,7 +2,7 @@ project(input-ogr)
 
 find_package(GDAL REQUIRED)
 
-add_library(input-ogr SHARED 
+add_library(input-ogr MODULE 
     ogr_converter.cpp
     ogr_datasource.cpp
     ogr_featureset.cpp
diff --git a/plugins/input/pgraster/CMakeLists.txt b/plugins/input/pgraster/CMakeLists.txt
index 146036044..adcb6d8f6 100644
--- a/plugins/input/pgraster/CMakeLists.txt
+++ b/plugins/input/pgraster/CMakeLists.txt
@@ -2,7 +2,7 @@ project(input-pgraster)
 
 find_package(PostgreSQL REQUIRED)
 
-add_library(input-pgraster SHARED 
+add_library(input-pgraster MODULE 
     pgraster_datasource.cpp 
     pgraster_featureset.cpp 
     pgraster_wkb_reader.cpp
diff --git a/plugins/input/postgis/CMakeLists.txt b/plugins/input/postgis/CMakeLists.txt
index 0102bac63..843786857 100644
--- a/plugins/input/postgis/CMakeLists.txt
+++ b/plugins/input/postgis/CMakeLists.txt
@@ -2,7 +2,7 @@ project(input-postgis)
 
 find_package(PostgreSQL REQUIRED)
 
-add_library(input-postgis SHARED 
+add_library(input-postgis MODULE 
     postgis_datasource.cpp 
     postgis_featureset.cpp 
 )
diff --git a/plugins/input/raster/CMakeLists.txt b/plugins/input/raster/CMakeLists.txt
index 9956b6d9b..f4e2f0ef8 100644
--- a/plugins/input/raster/CMakeLists.txt
+++ b/plugins/input/raster/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(input-raster)
 
-add_library(input-raster SHARED
+add_library(input-raster MODULE
     raster_datasource.cpp
     raster_featureset.cpp
     raster_info.cpp
diff --git a/plugins/input/shape/CMakeLists.txt b/plugins/input/shape/CMakeLists.txt
index c0a42b460..2c6ec6979 100644
--- a/plugins/input/shape/CMakeLists.txt
+++ b/plugins/input/shape/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(input-shape)
 
-add_library(input-shape SHARED 
+add_library(input-shape MODULE 
     dbfile.cpp 
     dbf_test.cpp
     shape_datasource.cpp
diff --git a/plugins/input/sqlite/CMakeLists.txt b/plugins/input/sqlite/CMakeLists.txt
index 4d1317aa5..89e693062 100644
--- a/plugins/input/sqlite/CMakeLists.txt
+++ b/plugins/input/sqlite/CMakeLists.txt
@@ -2,7 +2,7 @@ project(input-sqlite)
 
 find_package(SQLite3 REQUIRED)
 
-add_library(input-sqlite SHARED
+add_library(input-sqlite MODULE
     sqlite_datasource.cpp
     sqlite_featureset.cpp
 )
diff --git a/plugins/input/topojson/CMakeLists.txt b/plugins/input/topojson/CMakeLists.txt
index 32cfb1bd1..966d25b85 100644
--- a/plugins/input/topojson/CMakeLists.txt
+++ b/plugins/input/topojson/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(input-topojson)
 
-add_library(input-topojson SHARED
+add_library(input-topojson MODULE
     topojson_datasource.cpp
     topojson_featureset.cpp
 )