Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Execute ln command with GNU compatible options
On some OSX macport installation, GNU commands may be used in favor
of native commands and 'make install' fail with
'ln: invalid option -- 'h'"
As BSD ln support the GNU -n option as an equivalent of the -h option
it shoud be preferred over the specific BSD option.
Loading branch information
Showing
3 changed files
with
10 additions
and
10 deletions .
+2
−2
cmake/MacBundleMacros.cmake
+3
−3
mac/cmake/1qt.cmake.in
+5
−5
tests/bench/CMakeLists.txt
@@ -79,12 +79,12 @@ FUNCTION (COPY_FRAMEWORK FWPREFIX FWNAME FWDEST)
IF (IS_DIRECTORY "${FWDIRPHYS} " )
STRING (REGEX MATCH "[^/\n ]+$" FWVER "${FWDIRPHYS} " )
EXECUTE_PROCESS (COMMAND mkdir -p "${FWDEST} /${FWNAME} .framework/Versions/${FWVER} " )
EXECUTE_PROCESS (COMMAND ln -sfh ${FWVER} "${FWDEST} /${FWNAME} .framework/Versions/Current" )
EXECUTE_PROCESS (COMMAND ln -sfn ${FWVER} "${FWDEST} /${FWNAME} .framework/Versions/Current" )
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX} /${FWNAME} .framework/Versions/${FWVER} /${FWNAME} " "${FWDEST} /${FWNAME} .framework/Versions/${FWVER} /${FWNAME} " )
EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWNAME} "${FWDEST} /${FWNAME} .framework/${FWNAME} " )
IF (IS_DIRECTORY "${FWPREFIX} /${FWNAME} .framework/Versions/${FWVER} /Resources" )
EXECUTE_PROCESS (COMMAND cp -Rfp "${FWPREFIX} /${FWNAME} .framework/Versions/${FWVER} /Resources" "${FWDEST} /${FWNAME} .framework/Versions/${FWVER} " )
EXECUTE_PROCESS (COMMAND ln -sfh Versions/Current/Resources "${FWDEST} /${FWNAME} .framework/Resources" )
EXECUTE_PROCESS (COMMAND ln -sfn Versions/Current/Resources "${FWDEST} /${FWNAME} .framework/Resources" )
ENDIF (IS_DIRECTORY "${FWPREFIX} /${FWNAME} .framework/Versions/${FWVER} /Resources" )
# ensure writable by user, e.g. Homebrew frameworks are installed non-writable
EXECUTE_PROCESS (COMMAND chmod -R u+w "${FWDEST} /${FWNAME} .framework" )
@@ -29,11 +29,11 @@ MYMESSAGE ("Qt list: ${QTLISTQG}")
# symlinks when only @executable_path used
IF (NOT @OSX_HAVE_LOADERPATH@)
EXECUTE_PROCESS (COMMAND ln -sfh ../Frameworks "${QAPPDIR} /" )
EXECUTE_PROCESS (COMMAND ln -sfn ../Frameworks "${QAPPDIR} /" )
IF (IS_DIRECTORY "${QLIBXIR} /grass/bin" )
EXECUTE_PROCESS (COMMAND ln -sfh ../@QGIS_LIBEXEC_SUBDIR_REV@/@QGIS_FW_SUBDIR@ "${QLIBXDIR} /grass/Frameworks" )
EXECUTE_PROCESS (COMMAND ln -sfn ../@QGIS_LIBEXEC_SUBDIR_REV@/@QGIS_FW_SUBDIR@ "${QLIBXDIR} /grass/Frameworks" )
ENDIF ()
EXECUTE_PROCESS (COMMAND ln -sfh @QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@ "${QCGIDIR} /lib" )
EXECUTE_PROCESS (COMMAND ln -sfn @QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@ "${QCGIDIR} /lib" )
ENDIF (NOT @OSX_HAVE_LOADERPATH@)
# ## copy files
@@ -58,12 +58,12 @@ INSTALL (TARGETS qgis_bench
RUNTIME DESTINATION ${QGIS_BIN_DIR}
)
IF (APPLE)
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfh ../../../${QGIS_FW_SUBDIR} \" $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} /${QGIS_BIN_DIR} /qgis_bench.app/Contents/Frameworks\" )" )
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfh ../../../../${QGIS_LIB_SUBDIR} \" $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} /${QGIS_BIN_DIR} /qgis_bench.app/Contents/MacOS/lib\" )" )
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfh ../../../${QGIS_PLUGIN_SUBDIR} /.. \" $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} /${QGIS_BIN_DIR} /qgis_bench.app/Contents/Plugins\" )" )
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfh ../../../${QGIS_DATA_SUBDIR} \" $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} /${QGIS_BIN_DIR} /qgis_bench.app/Contents/Resources\" )" )
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfn ../../../${QGIS_FW_SUBDIR} \" $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} /${QGIS_BIN_DIR} /qgis_bench.app/Contents/Frameworks\" )" )
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfn ../../../../${QGIS_LIB_SUBDIR} \" $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} /${QGIS_BIN_DIR} /qgis_bench.app/Contents/MacOS/lib\" )" )
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfn ../../../${QGIS_PLUGIN_SUBDIR} /.. \" $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} /${QGIS_BIN_DIR} /qgis_bench.app/Contents/Plugins\" )" )
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfn ../../../${QGIS_DATA_SUBDIR} \" $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} /${QGIS_BIN_DIR} /qgis_bench.app/Contents/Resources\" )" )
# may not exist, unless BundleUtilities are used
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfh ../../../../share \" $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} /${QGIS_BIN_DIR} /qgis_bench.app/Contents/MacOS/share\" )" )
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfn ../../../../share \" $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} /${QGIS_BIN_DIR} /qgis_bench.app/Contents/MacOS/share\" )" )
ENDIF (APPLE)
Toggle all file notes