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

Comparing ray/src/rt/CMakeLists.txt (file contents):
Revision 1.10 by greg, Thu Apr 2 16:42:50 2015 UTC vs.
Revision 1.12 by greg, Tue Oct 27 22:14:34 2015 UTC

# Line 44 | Line 44 | if(X11_FOUND)
44    set(X11_SOURCES x11.c x11twind.c)
45    add_definitions("-DHAS_X11")
46   endif()
47 < if(QT4_FOUND)
47 > if(Qt5Widgets_DIR)
48 >  include_directories(${Qt5Widgets_INCLUDE_DIRS})
49    add_definitions("-DHAS_QT")
50   endif()
51 < if (X11_FOUND OR QT4_FOUND)
51 > if (X11_FOUND OR Qt5Widgets_DIR)
52    add_executable(rvu
53      rvmain.c rview.c rv2.c rv3.c devtable.c devcomm.c editline.c ${X11_SOURCES}
54      colortab.c)
# Line 55 | Line 56 | if (X11_FOUND OR QT4_FOUND)
56    list(APPEND targets_to_install rvu)
57  
58    # only link to rvu-qt-lib if qt is found
59 <  if(QT4_FOUND)
59 >  if(Qt5Widgets_DIR)
60      target_link_libraries(rvu qtrvu)
61    endif()
62   endif()
# Line 70 | 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 < install(FILES ${QT_QGIF_${qt_plugin_term}_RELEASE} DESTINATION bin/plugins/imageformats)
76 < install(FILES ${QT_QICO_${qt_plugin_term}_RELEASE} DESTINATION bin/plugins/imageformats)
77 < install(FILES ${QT_QJPEG_${qt_plugin_term}_RELEASE} DESTINATION bin/plugins/imageformats)
78 < install(FILES ${QT_QMNG_${qt_plugin_term}_RELEASE} DESTINATION bin/plugins/imageformats)
79 < install(FILES ${QT_QSVG_${qt_plugin_term}_RELEASE} DESTINATION bin/plugins/imageformats)
80 < install(FILES ${QT_QTIFF_${qt_plugin_term}_RELEASE} DESTINATION bin/plugins/imageformats)
81 < 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()
94 +
95 +    install(PROGRAMS "${QPA_PLUGIN}" DESTINATION bin/plugins/platforms)
96 +  endif()
97 + endif()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines