ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/CMakeLists.txt
(Generate patch)

Comparing ray/src/rt/CMakeLists.txt (file contents):
Revision 1.11 by greg, Fri May 8 18:07:38 2015 UTC vs.
Revision 1.12 by greg, Tue Oct 27 22:14:34 2015 UTC

# Line 71 | Line 71 | install(TARGETS ${targets_to_install}
71          ARCHIVE DESTINATION bin)
72   install(FILES rayinit.cal DESTINATION lib)
73  
74 < #install qt.conf & Qt plugins loaded by rvu at runtime
75 < get_target_property(GIF_PLUGIN Qt5::QGifPlugin LOCATION)
76 < get_target_property(ICO_PLUGIN Qt5::QICOPlugin LOCATION)
77 < get_target_property(JPEG_PLUGIN Qt5::QJpegPlugin LOCATION)
78 < get_target_property(MNG_PLUGIN Qt5::QMngPlugin LOCATION)
79 < get_target_property(TIFF_PLUGIN Qt5::QTiffPlugin LOCATION)
80 < install(PROGRAMS "${GIF_PLUGIN}" DESTINATION bin/plugins/imageformats)
81 < install(PROGRAMS "${ICO_PLUGIN}" DESTINATION bin/plugins/imageformats)
82 < install(PROGRAMS "${JPEG_PLUGIN}" DESTINATION bin/plugins/imageformats)
83 < install(PROGRAMS "${MNG_PLUGIN}" DESTINATION bin/plugins/imageformats)
84 < install(PROGRAMS "${TIFF_PLUGIN}" DESTINATION bin/plugins/imageformats)
85 < install(FILES ${CMAKE_SOURCE_DIR}/InstallRules/qt.conf DESTINATION bin)
74 > #install qt.conf & Qt plugins loaded by rvu at runtime. Ignore if we are building as headless
75 > if(NOT BUILD_HEADLESS)
76 >  get_target_property(GIF_PLUGIN Qt5::QGifPlugin LOCATION)
77 >  get_target_property(ICO_PLUGIN Qt5::QICOPlugin LOCATION)
78 >  get_target_property(JPEG_PLUGIN Qt5::QJpegPlugin LOCATION)
79 >  get_target_property(MNG_PLUGIN Qt5::QMngPlugin LOCATION)
80 >  get_target_property(TIFF_PLUGIN Qt5::QTiffPlugin LOCATION)
81 >  install(PROGRAMS "${GIF_PLUGIN}" DESTINATION bin/plugins/imageformats)
82 >  install(PROGRAMS "${ICO_PLUGIN}" DESTINATION bin/plugins/imageformats)
83 >  install(PROGRAMS "${JPEG_PLUGIN}" DESTINATION bin/plugins/imageformats)
84 >  install(PROGRAMS "${MNG_PLUGIN}" DESTINATION bin/plugins/imageformats)
85 >  install(PROGRAMS "${TIFF_PLUGIN}" DESTINATION bin/plugins/imageformats)
86 >  install(FILES ${CMAKE_SOURCE_DIR}/InstallRules/qt.conf DESTINATION bin)
87  
88 < if(APPLE OR WIN32)
89 <  if(WIN32)
90 <    get_target_property(QPA_PLUGIN Qt5::QWindowsIntegrationPlugin LOCATION)
91 <  elseif(APPLE)
92 <    get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
93 <  endif()
88 >  if(APPLE OR WIN32)
89 >    if(WIN32)
90 >      get_target_property(QPA_PLUGIN Qt5::QWindowsIntegrationPlugin LOCATION)
91 >    elseif(APPLE)
92 >      get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
93 >    endif()
94  
95 <  install(PROGRAMS "${QPA_PLUGIN}" DESTINATION bin/plugins/platforms)
95 >    install(PROGRAMS "${QPA_PLUGIN}" DESTINATION bin/plugins/platforms)
96 >  endif()
97   endif()
96 –

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)