[QGIS Commit] r14689 - trunk/qgis/mac/cmake

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2010-11-15 18:12:51 -0800 (Mon, 15 Nov 2010)
New Revision: 14689

Modified:
   trunk/qgis/mac/cmake/0qgis.cmake.in
   trunk/qgis/mac/cmake/1qt.cmake.in
   trunk/qgis/mac/cmake/2lib.cmake.in
   trunk/qgis/mac/cmake/3fw.cmake.in
Log:
only post-process mapserver if configured

Modified: trunk/qgis/mac/cmake/0qgis.cmake.in
===================================================================
--- trunk/qgis/mac/cmake/0qgis.cmake.in	2010-11-15 19:21:36 UTC (rev 14688)
+++ trunk/qgis/mac/cmake/0qgis.cmake.in	2010-11-16 02:12:51 UTC (rev 14689)
@@ -54,7 +54,9 @@
         ENDFOREACH (QLL)
     ENDFOREACH (PG)
     # qgis-mapserver
-    FOREACH (QLL ${QGLIBLIST})
-        INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL} ${ATEXECUTABLE}/@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${QLL} "${QCGIDIR}/qgis_mapserv.fcgi")
-    ENDFOREACH (QLL)
+    IF (@WITH_MAPSERVER@)
+        FOREACH (QLL ${QGLIBLIST})
+            INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL} ${ATEXECUTABLE}/@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${QLL} "${QCGIDIR}/qgis_mapserv.fcgi")
+        ENDFOREACH (QLL)
+    ENDIF ()
 ENDIF (@OSX_HAVE_LOADERPATH@)

Modified: trunk/qgis/mac/cmake/1qt.cmake.in
===================================================================
--- trunk/qgis/mac/cmake/1qt.cmake.in	2010-11-15 19:21:36 UTC (rev 14688)
+++ trunk/qgis/mac/cmake/1qt.cmake.in	2010-11-16 02:12:51 UTC (rev 14689)
@@ -220,10 +220,12 @@
     # applications behave better that way
     INSTALLNAMETOOL_CHANGE (${QFW_CHG} ${QFW_CHG_TO} "${QBINDIR}/qgis_help.app/Contents/MacOS/qgis_help")
     # qgis-mapserver
-    IF (@OSX_HAVE_LOADERPATH@)
-        SET (QFW_CHG_TO "${ATEXECUTABLE}/@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QFW}.framework/${QFW}")
-    ENDIF (@OSX_HAVE_LOADERPATH@)
-    INSTALLNAMETOOL_CHANGE (${QFW_CHG} ${QFW_CHG_TO} "${QCGIDIR}/qgis_mapserv.fcgi")
+    IF (@WITH_MAPSERVER@)
+        IF (@OSX_HAVE_LOADERPATH@)
+            SET (QFW_CHG_TO "${ATEXECUTABLE}/@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QFW}.framework/${QFW}")
+        ENDIF (@OSX_HAVE_LOADERPATH@)
+        INSTALLNAMETOOL_CHANGE (${QFW_CHG} ${QFW_CHG_TO} "${QCGIDIR}/qgis_mapserv.fcgi")
+    ENDIF ()
     # libs
     IF (@OSX_HAVE_LOADERPATH@)
         SET (QFW_CHG_TO "${ATLOADER}/@QGIS_LIB_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QFW}.framework/${QFW}")

Modified: trunk/qgis/mac/cmake/2lib.cmake.in
===================================================================
--- trunk/qgis/mac/cmake/2lib.cmake.in	2010-11-15 19:21:36 UTC (rev 14688)
+++ trunk/qgis/mac/cmake/2lib.cmake.in	2010-11-16 02:12:51 UTC (rev 14689)
@@ -36,10 +36,12 @@
         INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QAPPDIR}/Qgis")
         # qgis_help - doesn't link anything else than Qt/Qgis
         # qgis-mapserver
-        IF (@OSX_HAVE_LOADERPATH@)
-            SET (LIB_CHG_TO "${ATEXECUTABLE}/@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${LIBTO}")
-        ENDIF (@OSX_HAVE_LOADERPATH@)
-        INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QCGIDIR}/qgis_mapserv.fcgi")
+        IF (@WITH_MAPSERVER@)
+            IF (@OSX_HAVE_LOADERPATH@)
+                SET (LIB_CHG_TO "${ATEXECUTABLE}/@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${LIBTO}")
+            ENDIF (@OSX_HAVE_LOADERPATH@)
+            INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QCGIDIR}/qgis_mapserv.fcgi")
+        ENDIF ()
         # libs
         IF (@OSX_HAVE_LOADERPATH@)
             SET (LIB_CHG_TO "${ATLOADER}/@QGIS_LIB_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${LIBTO}")

Modified: trunk/qgis/mac/cmake/3fw.cmake.in
===================================================================
--- trunk/qgis/mac/cmake/3fw.cmake.in	2010-11-15 19:21:36 UTC (rev 14688)
+++ trunk/qgis/mac/cmake/3fw.cmake.in	2010-11-16 02:12:51 UTC (rev 14689)
@@ -34,10 +34,12 @@
         INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QAPPDIR}/Qgis")
         # qgis_help - doesn't link anything else than Qt/Qgis
         # qgis-mapserver
-        IF (@OSX_HAVE_LOADERPATH@)
-            SET (LIB_CHG_TO "${ATEXECUTABLE}/@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${LIBTO}")
-        ENDIF (@OSX_HAVE_LOADERPATH@)
-        INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QCGIDIR}/qgis_mapserv.fcgi")
+        IF (@WITH_MAPSERVER@)
+            IF (@OSX_HAVE_LOADERPATH@)
+                SET (LIB_CHG_TO "${ATEXECUTABLE}/@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${LIBTO}")
+            ENDIF (@OSX_HAVE_LOADERPATH@)
+            INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QCGIDIR}/qgis_mapserv.fcgi")
+        ENDIF ()
         # libs
         IF (@OSX_HAVE_LOADERPATH@)
             SET (LIB_CHG_TO "${ATLOADER}/@QGIS_LIB_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${LIBTO}")