From 3fdc911d8a12213293b0934fc4a6189ad4abef7f Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Thu, 13 Jul 2017 16:48:11 -0600 Subject: [PATCH] generalized image plugin install code --- share/openbr/cmake/InstallDependencies.cmake | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/share/openbr/cmake/InstallDependencies.cmake b/share/openbr/cmake/InstallDependencies.cmake index 678ae7e..ffda6b1 100644 --- a/share/openbr/cmake/InstallDependencies.cmake +++ b/share/openbr/cmake/InstallDependencies.cmake @@ -89,19 +89,13 @@ function(install_qt_imageformats) set(INSTALL_DEPENDENCIES_EXTENSION ".so") endif() - install(FILES ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qgif${INSTALL_DEPENDENCIES_EXTENSION} - ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qico${INSTALL_DEPENDENCIES_EXTENSION} - ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qjpeg${INSTALL_DEPENDENCIES_EXTENSION} - ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qsvg${INSTALL_DEPENDENCIES_EXTENSION} - DESTINATION bin/imageformats) - - if(QT_MULTIARCH STREQUAL "") - install(FILES ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qmng${INSTALL_DEPENDENCIES_EXTENSION} - ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qtga${INSTALL_DEPENDENCIES_EXTENSION} - ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qtiff${INSTALL_DEPENDENCIES_EXTENSION} - ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qwbmp${INSTALL_DEPENDENCIES_EXTENSION} - DESTINATION bin/imageformats) - endif() + foreach (IMGPLUGIN qgif qico qjpeg qmng qsvg qtga qtiff qwbmp) + set(IMGFILE "${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}${IMGPLUGIN}${INSTALL_DEPENDENCIES_EXTENSION}") + if(EXISTS ${IMGFILE}) + install(FILES ${IMGFILE} + DESTINATION bin/imageformats) + endif() + endforeach() endif() endfunction() -- libgit2 0.21.4