Peter M. Groen / openbr

Commit 335e5817007ba9bd2266847ff1d916f43684888d

Authored by Scott Klum
1 parent 76e69ec6

Fixed imageformat dependencies on OSX

Inline Side-by-side
Showing 1 changed file with 16 additions and 9 deletions
share/openbr/cmake/InstallDependencies.cmake
  View file @335e581
... ... @@ -55,15 +55,22 @@ endfunction()
55 55 # Qt Plugins
56 56 function(install_qt_imageformats)
57 57 if(${BR_INSTALL_DEPENDENCIES})
58   - set(IMAGE_FORMATS_DIR "${_qt5Core_install_prefix}/plugins/imageformats/")
59   - install(FILES ${IMAGE_FORMATS_DIR}/qgif.dll
60   - ${IMAGE_FORMATS_DIR}/qico.dll
61   - ${IMAGE_FORMATS_DIR}/qjpeg.dll
62   - ${IMAGE_FORMATS_DIR}/qmng.dll
63   - ${IMAGE_FORMATS_DIR}/qsvg.dll
64   - ${IMAGE_FORMATS_DIR}/qtga.dll
65   - ${IMAGE_FORMATS_DIR}/qtiff.dll
66   - ${IMAGE_FORMATS_DIR}/qwbmp.dll
  58 + set(IMAGE_FORMATS_DIR "${_qt5Core_install_prefix}/plugins/imageformats")
  59 + if(CMAKE_HOST_WIN32)
  60 + set(INSTALL_DEPENDENCIES_PREFIX "")
  61 + set(INSTALL_DEPENDENCIES_EXTENSION ".dll")
  62 + else()
  63 + set(INSTALL_DEPENDENCIES_PREFIX "lib")
  64 + set(INSTALL_DEPENDENCIES_EXTENSION ".dylib")
  65 + endif()
  66 + install(FILES ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qgif${INSTALL_DEPENDENCIES_EXTENSION}
  67 + ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qico${INSTALL_DEPENDENCIES_EXTENSION}
  68 + ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qjpeg${INSTALL_DEPENDENCIES_EXTENSION}
  69 + ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qmng${INSTALL_DEPENDENCIES_EXTENSION}
  70 + ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qsvg${INSTALL_DEPENDENCIES_EXTENSION}
  71 + ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qtga${INSTALL_DEPENDENCIES_EXTENSION}
  72 + ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qtiff${INSTALL_DEPENDENCIES_EXTENSION}
  73 + ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qwbmp${INSTALL_DEPENDENCIES_EXTENSION}
67 74 DESTINATION bin/imageformats)
68 75 endif()
69 76 endfunction()
... ...