diff --git a/cmake/QSkinnyTools.cmake b/cmake/QSkinnyTools.cmake index c4838a32..cc29c00c 100644 --- a/cmake/QSkinnyTools.cmake +++ b/cmake/QSkinnyTools.cmake @@ -18,10 +18,14 @@ function(qsk_svg2qvg SVG_FILENAME QVG_FILENAME) # find svg2qvg target location get_target_property(Svg2QvgLocation Qsk::Svg2Qvg LOCATION) get_filename_component(Svg2QvgDirectory ${Svg2QvgLocation} DIRECTORY) + message(STATUS "Svg2QvgLocation: ${Svg2QvgLocation}") + message(STATUS "Svg2QvgDirectory: ${Svg2QvgDirectory}") # find qt svg target location get_target_property(QtSvgTargetLocation ${QtSvgTarget} LOCATION) get_filename_component(QtSvgTargetDirectory ${QtSvgTargetLocation} DIRECTORY) + message(STATUS "QtSvgTargetLocation: ${QtSvgTargetLocation}") + message(STATUS "QtSvgTargetDirectory: ${QtSvgTargetDirectory}") # select platform specific wrapper script if (CMAKE_SYSTEM_NAME MATCHES "Windows") diff --git a/cmake/scripts/QSkinnySvg2Qvg.lin.sh b/cmake/scripts/QSkinnySvg2Qvg.lin.sh index 7e284410..67ff94f3 100755 --- a/cmake/scripts/QSkinnySvg2Qvg.lin.sh +++ b/cmake/scripts/QSkinnySvg2Qvg.lin.sh @@ -1,4 +1,4 @@ -#/bin/bash +#!/bin/bash SVG2QVG=$1 SVG=$2 diff --git a/cmake/scripts/QSkinnySvg2Qvg.mac.sh b/cmake/scripts/QSkinnySvg2Qvg.mac.sh index bd245a89..c3555db1 100755 --- a/cmake/scripts/QSkinnySvg2Qvg.mac.sh +++ b/cmake/scripts/QSkinnySvg2Qvg.mac.sh @@ -1,7 +1,10 @@ -#/bin/bash +#!/bin/bash SVG2QVG=$1 SVG=$2 QVG=$3 +export DYLD_LIBRARY_PATH=$4:$DYLD_LIBRARY_PATH +otool -L $SVG2QVG + DYLD_LIBRARY_PATH=$4:$DYLD_LIBRARY_PATH $SVG2QVG $SVG $QVG \ No newline at end of file diff --git a/tools/svg2qvg/CMakeLists.txt b/tools/svg2qvg/CMakeLists.txt index 90c70e93..90ea5a87 100644 --- a/tools/svg2qvg/CMakeLists.txt +++ b/tools/svg2qvg/CMakeLists.txt @@ -51,6 +51,7 @@ install(TARGETS ${target}) set(PACKAGE_TARGET_FILENAME QSkinnyToolsTargets.cmake) set_target_properties(${target} PROPERTIES EXPORT_NAME Svg2Qvg) +set_target_properties(${target} PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) install(TARGETS ${target} EXPORT ${PACKAGE_TARGET_FILENAME})