File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -608,13 +608,13 @@ cd ../../
608608if [ " $RUNNER_OS " != " Linux" ]; then
609609 if [ " $RUNNER_OS " == " macOS" ]; then
610610 # combine using libtool on mac
611- libtool -static -o /opt/smelibs/ lib/libCombinedFreetype.a /opt/smelibs/ lib/libQt6BundledFreetype.a /opt/smelibs/ lib/libQt6BundledLibpng.a /opt/smelibs /lib/libz.a
611+ libtool -static -o ${INSTALL_PREFIX} / lib/libCombinedFreetype.a ${INSTALL_PREFIX} / lib/libQt6BundledFreetype.a ${INSTALL_PREFIX} / lib/libQt6BundledLibpng.a ${INSTALL_PREFIX} /lib/libz.a
612612 elif [ " $RUNNER_OS " == " Windows" ]; then
613613 # combine using ld and ar on msys
614- ld -r -o libCombinedFreetype.o /opt/smelibs/ lib/libQt6BundledFreetype.a /opt/smelibs/ lib/libQt6BundledLibpng.a /opt/smelibs /lib/libz.a
615- ar rcs /opt/smelibs /lib/libCombinedFreetype.a libCombinedFreetype.o
614+ ld -r -o libCombinedFreetype.o ${INSTALL_PREFIX} / lib/libQt6BundledFreetype.a ${INSTALL_PREFIX} / lib/libQt6BundledLibpng.a ${INSTALL_PREFIX} /lib/libz.a
615+ ar rcs ${INSTALL_PREFIX} /lib/libCombinedFreetype.a libCombinedFreetype.o
616616 fi
617- VTK_OPTIONS=" -DFREETYPE_LIBRARY_RELEASE=/opt/smelibs/ lib/libCombinedFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/opt/smelibs/ include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/opt/smelibs /include/QtFreetype"
617+ VTK_OPTIONS=" -DFREETYPE_LIBRARY_RELEASE=${INSTALL_PREFIX} / lib/libCombinedFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=${INSTALL_PREFIX} / include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=${INSTALL_PREFIX} /include/QtFreetype"
618618fi
619619
620620# build minimal static version of VTK including GUISupportQt and RenderingQt modules
You can’t perform that action at this time.
0 commit comments