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.11 by greg, Fri May 8 18:07:38 2015 UTC vs.
Revision 1.13 by greg, Tue Mar 22 21:36:24 2016 UTC

# Line 48 | Line 48 | if(Qt5Widgets_DIR)
48    include_directories(${Qt5Widgets_INCLUDE_DIRS})
49    add_definitions("-DHAS_QT")
50   endif()
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)
55 <  target_link_libraries(rvu raycalls radiance rtrad ${X11_LIBRARIES})
56 <  list(APPEND targets_to_install rvu)
51 > if(NOT BUILD_HEADLESS)
52 >  if (X11_FOUND OR Qt5Widgets_DIR)
53 >    add_executable(rvu
54 >      rvmain.c rview.c rv2.c rv3.c devtable.c devcomm.c editline.c ${X11_SOURCES}
55 >      colortab.c)
56 >    target_link_libraries(rvu raycalls radiance rtrad ${X11_LIBRARIES})
57 >    list(APPEND targets_to_install rvu)
58  
59 <  # only link to rvu-qt-lib if qt is found
60 <  if(Qt5Widgets_DIR)
61 <    target_link_libraries(rvu qtrvu)
59 >    # only link to rvu-qt-lib if qt is found
60 >    if(Qt5Widgets_DIR)
61 >      target_link_libraries(rvu qtrvu)
62 >    endif()
63    endif()
64   endif()
65  
# Line 71 | Line 73 | install(TARGETS ${targets_to_install}
73          ARCHIVE DESTINATION bin)
74   install(FILES rayinit.cal DESTINATION lib)
75  
76 < #install qt.conf & Qt plugins loaded by rvu at runtime
77 < get_target_property(GIF_PLUGIN Qt5::QGifPlugin LOCATION)
78 < get_target_property(ICO_PLUGIN Qt5::QICOPlugin LOCATION)
79 < get_target_property(JPEG_PLUGIN Qt5::QJpegPlugin LOCATION)
80 < get_target_property(MNG_PLUGIN Qt5::QMngPlugin LOCATION)
81 < get_target_property(TIFF_PLUGIN Qt5::QTiffPlugin LOCATION)
82 < install(PROGRAMS "${GIF_PLUGIN}" DESTINATION bin/plugins/imageformats)
83 < install(PROGRAMS "${ICO_PLUGIN}" DESTINATION bin/plugins/imageformats)
84 < install(PROGRAMS "${JPEG_PLUGIN}" DESTINATION bin/plugins/imageformats)
85 < install(PROGRAMS "${MNG_PLUGIN}" DESTINATION bin/plugins/imageformats)
86 < install(PROGRAMS "${TIFF_PLUGIN}" DESTINATION bin/plugins/imageformats)
87 < install(FILES ${CMAKE_SOURCE_DIR}/InstallRules/qt.conf DESTINATION bin)
76 > #install qt.conf & Qt plugins loaded by rvu at runtime. Ignore if we are building as headless
77 > if(NOT BUILD_HEADLESS)
78 >  get_target_property(GIF_PLUGIN Qt5::QGifPlugin LOCATION)
79 >  get_target_property(ICO_PLUGIN Qt5::QICOPlugin LOCATION)
80 >  get_target_property(JPEG_PLUGIN Qt5::QJpegPlugin LOCATION)
81 >  get_target_property(MNG_PLUGIN Qt5::QMngPlugin LOCATION)
82 >  get_target_property(TIFF_PLUGIN Qt5::QTiffPlugin LOCATION)
83 >  install(PROGRAMS "${GIF_PLUGIN}" DESTINATION bin/plugins/imageformats)
84 >  install(PROGRAMS "${ICO_PLUGIN}" DESTINATION bin/plugins/imageformats)
85 >  install(PROGRAMS "${JPEG_PLUGIN}" DESTINATION bin/plugins/imageformats)
86 >  install(PROGRAMS "${MNG_PLUGIN}" DESTINATION bin/plugins/imageformats)
87 >  install(PROGRAMS "${TIFF_PLUGIN}" DESTINATION bin/plugins/imageformats)
88 >  install(FILES ${CMAKE_SOURCE_DIR}/InstallRules/qt.conf DESTINATION bin)
89  
90 < if(APPLE OR WIN32)
91 <  if(WIN32)
92 <    get_target_property(QPA_PLUGIN Qt5::QWindowsIntegrationPlugin LOCATION)
93 <  elseif(APPLE)
94 <    get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
95 <  endif()
90 >  if(APPLE OR WIN32)
91 >    if(WIN32)
92 >      get_target_property(QPA_PLUGIN Qt5::QWindowsIntegrationPlugin LOCATION)
93 >    elseif(APPLE)
94 >      get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
95 >    endif()
96  
97 <  install(PROGRAMS "${QPA_PLUGIN}" DESTINATION bin/plugins/platforms)
97 >    install(PROGRAMS "${QPA_PLUGIN}" DESTINATION bin/plugins/platforms)
98 >  endif()
99   endif()
96 –

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines