Skip to content

Commit

Permalink
don't create framework folders if framework does not exist;
Browse files Browse the repository at this point in the history
quote library names for IF test
  • Loading branch information
kyngchaos committed Dec 25, 2011
1 parent 603081f commit a4bbcfd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion mac/cmake/1qt.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
4 changes: 2 additions & 2 deletions mac/cmake/2lib.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand Down

0 comments on commit a4bbcfd

Please sign in to comment.