--- ray/src/rt/CMakeLists.txt 2015/05/08 18:07:38 1.11 +++ ray/src/rt/CMakeLists.txt 2015/10/27 22:14:34 1.12 @@ -71,26 +71,27 @@ install(TARGETS ${targets_to_install} ARCHIVE DESTINATION bin) install(FILES rayinit.cal DESTINATION lib) -#install qt.conf & Qt plugins loaded by rvu at runtime -get_target_property(GIF_PLUGIN Qt5::QGifPlugin LOCATION) -get_target_property(ICO_PLUGIN Qt5::QICOPlugin LOCATION) -get_target_property(JPEG_PLUGIN Qt5::QJpegPlugin LOCATION) -get_target_property(MNG_PLUGIN Qt5::QMngPlugin LOCATION) -get_target_property(TIFF_PLUGIN Qt5::QTiffPlugin LOCATION) -install(PROGRAMS "${GIF_PLUGIN}" DESTINATION bin/plugins/imageformats) -install(PROGRAMS "${ICO_PLUGIN}" DESTINATION bin/plugins/imageformats) -install(PROGRAMS "${JPEG_PLUGIN}" DESTINATION bin/plugins/imageformats) -install(PROGRAMS "${MNG_PLUGIN}" DESTINATION bin/plugins/imageformats) -install(PROGRAMS "${TIFF_PLUGIN}" DESTINATION bin/plugins/imageformats) -install(FILES ${CMAKE_SOURCE_DIR}/InstallRules/qt.conf DESTINATION bin) +#install qt.conf & Qt plugins loaded by rvu at runtime. Ignore if we are building as headless +if(NOT BUILD_HEADLESS) + get_target_property(GIF_PLUGIN Qt5::QGifPlugin LOCATION) + get_target_property(ICO_PLUGIN Qt5::QICOPlugin LOCATION) + get_target_property(JPEG_PLUGIN Qt5::QJpegPlugin LOCATION) + get_target_property(MNG_PLUGIN Qt5::QMngPlugin LOCATION) + get_target_property(TIFF_PLUGIN Qt5::QTiffPlugin LOCATION) + install(PROGRAMS "${GIF_PLUGIN}" DESTINATION bin/plugins/imageformats) + install(PROGRAMS "${ICO_PLUGIN}" DESTINATION bin/plugins/imageformats) + install(PROGRAMS "${JPEG_PLUGIN}" DESTINATION bin/plugins/imageformats) + install(PROGRAMS "${MNG_PLUGIN}" DESTINATION bin/plugins/imageformats) + install(PROGRAMS "${TIFF_PLUGIN}" DESTINATION bin/plugins/imageformats) + install(FILES ${CMAKE_SOURCE_DIR}/InstallRules/qt.conf DESTINATION bin) -if(APPLE OR WIN32) - if(WIN32) - get_target_property(QPA_PLUGIN Qt5::QWindowsIntegrationPlugin LOCATION) - elseif(APPLE) - get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION) - endif() + if(APPLE OR WIN32) + if(WIN32) + get_target_property(QPA_PLUGIN Qt5::QWindowsIntegrationPlugin LOCATION) + elseif(APPLE) + get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION) + endif() - install(PROGRAMS "${QPA_PLUGIN}" DESTINATION bin/plugins/platforms) + install(PROGRAMS "${QPA_PLUGIN}" DESTINATION bin/plugins/platforms) + endif() endif() -