Enabled by default and removed linked qgispython

Funded by ItOpen - http://www.itopen.it
qgis · Nov 26, 2014 · 7d42846 · 7d42846
1 parent 35dd4e6
commit 7d42846
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,7 @@ IF(WITH_MAPSERVER)
 ENDIF(WITH_MAPSERVER)
 
 
-SET (WITH_SERVER_PLUGINS FALSE CACHE BOOL "Determines whether QGIS mapserver support for python plugins should be built")
+SET (WITH_SERVER_PLUGINS TRUE CACHE BOOL "Determines whether QGIS mapserver support for python plugins should be built")
 IF(WITH_SERVER_PLUGINS)
   SET(MAPSERVER_HAVE_PYTHON_PLUGINS TRUE)
 ENDIF(WITH_SERVER_PLUGINS)

diff --git a/src/mapserver/CMakeLists.txt b/src/mapserver/CMakeLists.txt
@@ -64,7 +64,6 @@ SET (qgis_mapserv_RCCS
 
 
 
-IF (WITH_SERVER_PLUGINS)
 #############################################################
 # qgis_server library
 
@@ -102,6 +101,7 @@ TARGET_LINK_LIBRARIES(qgis_server
   ${GDAL_LIBRARY}
 )
 
+IF (WITH_SERVER_PLUGINS)
 # install
 
 INSTALL(TARGETS qgis_server
@@ -167,13 +167,6 @@ TARGET_LINK_LIBRARIES(qgis_mapserv.fcgi
   ${GDAL_LIBRARY}
 )
 
-IF (WITH_SERVER_PLUGINS)
-TARGET_LINK_LIBRARIES(qgis_mapserv.fcgi
-  qgispython
-)
-
-ENDIF (WITH_SERVER_PLUGINS)
-
 ########################################################
 # Install