Commit dfdf6f9c authored by Guillaume Pasero's avatar Guillaume Pasero

Merge branch 'packaging_install_fonts' into 'release-6.6'

Packaging install fonts

See merge request !67
parents 2524e6f4 766af201
......@@ -75,7 +75,7 @@ chmod +x "$OUT_DIR/mapla.sh"
sed -i -E "s,OUT_DIR,$OUT_DIR,g" "$OUT_DIR/otbenv.profile"
chmod +x "$OUT_DIR/otbenv.profile"
sed -i -E "s,../lib,$OUT_DIR/lib,g" "$OUT_DIR/bin/qt.conf"
sed -i -E "s,Prefix=..,Prefix=$OUT_DIR,g" "$OUT_DIR/bin/qt.conf"
#echo "Creating symbolic links..."
. ./make_symlinks
......
......@@ -82,7 +82,7 @@ rm -fr "template.app"
LONG_VERSION_STRING=@Monteverdi_VERSION_MAJOR@.@Monteverdi_VERSION_MINOR@.@Monteverdi_VERSION_PATCH@
SHORT_VERSION_STRING=@Monteverdi_VERSION_MAJOR@.@Monteverdi_VERSION_MINOR@
#sed qt.conf
sed -i "" "s,../lib,$OUT_DIR/lib,g" "$OUT_DIR/bin/qt.conf"
sed -i "" "s,Prefix=..,Prefix=$OUT_DIR,g" "$OUT_DIR/bin/qt.conf"
cp "$OUT_DIR/bin/qt.conf" "$OUT_DIR/Mapla.app/Contents/Resources/qt.conf"
cp "$OUT_DIR/Monteverdi.icns" "Mapla.app/Contents/Resources/"
......
[Paths]
Translations=../translations
Plugins=../plugins
Prefix=..
......@@ -42,5 +42,8 @@ set(QT_REQ_DIRS)
${CMAKE_CURRENT_SOURCE_DIR}/Files/qt.conf
DESTINATION ${PKG_STAGE_DIR}/bin
)
if(IS_DIRECTORY "${SUPERBUILD_INSTALL_DIR}/lib/fonts")
install_without_message("${SUPERBUILD_INSTALL_DIR}/lib/fonts" "lib")
endif()
endfunction()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment