File tree Expand file tree Collapse file tree 4 files changed +23
-15
lines changed
Expand file tree Collapse file tree 4 files changed +23
-15
lines changed Original file line number Diff line number Diff line change @@ -54,7 +54,9 @@ IF (@OSX_HAVE_LOADERPATH@)
5454 ENDFOREACH (QLL)
5555 ENDFOREACH (PG)
5656 # qgis-mapserver
57- FOREACH (QLL ${QGLIBLIST} )
58- INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR @/${QLL} ${ATEXECUTABLE} /@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${QLL} "${QCGIDIR} /qgis_mapserv.fcgi" )
59- ENDFOREACH (QLL)
57+ IF (@WITH_MAPSERVER@)
58+ FOREACH (QLL ${QGLIBLIST} )
59+ INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR @/${QLL} ${ATEXECUTABLE} /@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${QLL} "${QCGIDIR} /qgis_mapserv.fcgi" )
60+ ENDFOREACH (QLL)
61+ ENDIF ()
6062ENDIF (@OSX_HAVE_LOADERPATH@)
Original file line number Diff line number Diff line change @@ -220,10 +220,12 @@ FOREACH (QFW ${QTLISTQG})
220220 # applications behave better that way
221221 INSTALLNAMETOOL_CHANGE (${QFW_CHG} ${QFW_CHG_TO} "${QBINDIR} /qgis_help.app/Contents/MacOS/qgis_help" )
222222 # qgis-mapserver
223- IF (@OSX_HAVE_LOADERPATH@)
224- SET (QFW_CHG_TO "${ATEXECUTABLE} /@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QFW} .framework/${QFW} " )
225- ENDIF (@OSX_HAVE_LOADERPATH@)
226- INSTALLNAMETOOL_CHANGE (${QFW_CHG} ${QFW_CHG_TO} "${QCGIDIR} /qgis_mapserv.fcgi" )
223+ IF (@WITH_MAPSERVER@)
224+ IF (@OSX_HAVE_LOADERPATH@)
225+ SET (QFW_CHG_TO "${ATEXECUTABLE} /@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QFW} .framework/${QFW} " )
226+ ENDIF (@OSX_HAVE_LOADERPATH@)
227+ INSTALLNAMETOOL_CHANGE (${QFW_CHG} ${QFW_CHG_TO} "${QCGIDIR} /qgis_mapserv.fcgi" )
228+ ENDIF ()
227229 # libs
228230 IF (@OSX_HAVE_LOADERPATH@)
229231 SET (QFW_CHG_TO "${ATLOADER} /@QGIS_LIB_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QFW} .framework/${QFW} " )
Original file line number Diff line number Diff line change @@ -36,10 +36,12 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
3636 INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QAPPDIR} /Qgis" )
3737 # qgis_help - doesn't link anything else than Qt/Qgis
3838 # qgis-mapserver
39- IF (@OSX_HAVE_LOADERPATH@)
40- SET (LIB_CHG_TO "${ATEXECUTABLE} /@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${LIBTO} " )
41- ENDIF (@OSX_HAVE_LOADERPATH@)
42- INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QCGIDIR} /qgis_mapserv.fcgi" )
39+ IF (@WITH_MAPSERVER@)
40+ IF (@OSX_HAVE_LOADERPATH@)
41+ SET (LIB_CHG_TO "${ATEXECUTABLE} /@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${LIBTO} " )
42+ ENDIF (@OSX_HAVE_LOADERPATH@)
43+ INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QCGIDIR} /qgis_mapserv.fcgi" )
44+ ENDIF ()
4345 # libs
4446 IF (@OSX_HAVE_LOADERPATH@)
4547 SET (LIB_CHG_TO "${ATLOADER} /@QGIS_LIB_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${LIBTO} " )
Original file line number Diff line number Diff line change @@ -34,10 +34,12 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
3434 INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QAPPDIR} /Qgis" )
3535 # qgis_help - doesn't link anything else than Qt/Qgis
3636 # qgis-mapserver
37- IF (@OSX_HAVE_LOADERPATH@)
38- SET (LIB_CHG_TO "${ATEXECUTABLE} /@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${LIBTO} " )
39- ENDIF (@OSX_HAVE_LOADERPATH@)
40- INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QCGIDIR} /qgis_mapserv.fcgi" )
37+ IF (@WITH_MAPSERVER@)
38+ IF (@OSX_HAVE_LOADERPATH@)
39+ SET (LIB_CHG_TO "${ATEXECUTABLE} /@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${LIBTO} " )
40+ ENDIF (@OSX_HAVE_LOADERPATH@)
41+ INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QCGIDIR} /qgis_mapserv.fcgi" )
42+ ENDIF ()
4143 # libs
4244 IF (@OSX_HAVE_LOADERPATH@)
4345 SET (LIB_CHG_TO "${ATLOADER} /@QGIS_LIB_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${LIBTO} " )
You can’t perform that action at this time.
0 commit comments