don't create framework folders if framework does not exist;

quote library names for IF test
qgis · Dec 25, 2011 · a4bbcfd · a4bbcfd
1 parent 603081f
commit a4bbcfd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in
@@ -85,7 +85,7 @@ ENDIF (NOT @OSX_HAVE_LOADERPATH@)
 MESSAGE (STATUS "Copying Qt frameworks...")
 EXECUTE_PROCESS (COMMAND mkdir -p "${QFWDIR}")
 FOREACH (QFW ${QTLISTQG})
-    IF (NOT IS_DIRECTORY "${QFWDIR}/${QFW}.framework")
+    IF (IS_DIRECTORY "@QT_LIBRARY_DIR@/${QFW}.framework/Versions/${QT_FWVER}" AND NOT IS_DIRECTORY "${QFWDIR}/${QFW}.framework")
         # reconstruct framework to avoid excessive copying, then deleting
         #   especially when debug variants are present
         EXECUTE_PROCESS (COMMAND mkdir -p "${QFWDIR}/${QFW}.framework/Versions/${QT_FWVER}")

diff --git a/mac/cmake/2lib.cmake.in b/mac/cmake/2lib.cmake.in
@@ -91,7 +91,7 @@ FILE (GLOB QGPYLIST ${QGISPYDIR}/qgis/*.so)
 
 # Postgres
 
-IF (@POSTGRES_LIBRARY@ MATCHES ".*libpq.dylib")
+IF ("@POSTGRES_LIBRARY@" MATCHES ".*libpq.dylib")
     MESSAGE (STATUS "Copying libpq and updating library paths...")
     MYMESSAGE ("ditto ${QARCHS} \"@POSTGRES_LIBRARY@\" \"${QLIBDIR}/libpq.dylib\"")
     EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@POSTGRES_LIBRARY@" "${QLIBDIR}/libpq.dylib")
@@ -111,7 +111,7 @@ ENDIF ()
 
 # libfcgi (non-system)
 
-IF (@FCGI_LIBRARY@ MATCHES ".*libfcgi.dylib" AND NOT @FCGI_LIBRARY@ MATCHES "/usr/lib/.*")
+IF ("@FCGI_LIBRARY@ MATCHES" ".*libfcgi.dylib" AND NOT "@FCGI_LIBRARY@" MATCHES "/usr/lib/.*")
     MESSAGE (STATUS "Copying libfcgi and updating library paths...")
     MYMESSAGE ("ditto ${QARCHS} \"@FCGI_LIBRARY@\" \"${QLIBDIR}/libfcgi.dylib\"")
     EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@FCGI_LIBRARY@" "${QLIBDIR}/libfcgi.dylib")