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.9 by greg, Thu Mar 20 22:49:21 2014 UTC vs.
Revision 1.11 by greg, Fri May 8 18:07:38 2015 UTC

# Line 7 | Line 7 | add_library(radiance
7    m_mirror.c m_mist.c mx_func.c mx_data.c noise3.c normal.c o_face.c o_cone.c
8    o_instance.c o_mesh.c p_data.c p_func.c preload.c raytrace.c renderopts.c
9    source.c sphere.c srcobstr.c srcsupp.c srcsamp.c t_data.c t_func.c text.c
10 +  pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c
11 +  pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c
12 +  pmapdata.c pmapdiag.c pmaptype.c
13    "${VERSION_FILE}" virtuals.c)
14  
15   if(WIN32)
# Line 29 | Line 32 | target_link_libraries(lookamb rtrad)
32   add_executable(rcontrib rcmain.c rcontrib.c rc2.c rc3.c)
33   target_link_libraries(rcontrib radiance rtrad)
34  
35 < set(targets_to_install lookamb radiance raycalls rtrace rpict rcontrib)
35 > add_executable(mkpmap mkpmap.c)
36 > target_link_libraries(mkpmap radiance rtrad)
37  
38 + add_executable(pmapdump pmapdump.c pmaptype.c pmapparm.c)
39 + target_link_libraries(pmapdump radiance rtrad)
40 +
41 + set(targets_to_install lookamb radiance raycalls rtrace rpict rcontrib mkpmap pmapdump)
42 +
43   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 46 | 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 62 | Line 72 | install(TARGETS ${targets_to_install}
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)
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)
86 +
87 + if(APPLE OR WIN32)
88 +  if(WIN32)
89 +    get_target_property(QPA_PLUGIN Qt5::QWindowsIntegrationPlugin LOCATION)
90 +  elseif(APPLE)
91 +    get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
92 +  endif()
93 +
94 +  install(PROGRAMS "${QPA_PLUGIN}" DESTINATION bin/plugins/platforms)
95 + endif()
96  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines