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

Comparing ray/InstallRules/CMakeLists.txt (file contents):
Revision 1.8 by greg, Thu Aug 17 21:32:29 2017 UTC vs.
Revision 1.9 by greg, Mon Jan 8 16:51:31 2018 UTC

# Line 19 | Line 19 | if(NOT BUILD_HEADLESS)
19    get_target_property(GIF_PLUGIN Qt5::QGifPlugin LOCATION)
20    get_target_property(ICO_PLUGIN Qt5::QICOPlugin LOCATION)
21    get_target_property(JPEG_PLUGIN Qt5::QJpegPlugin LOCATION)
22  #get_target_property(MNG_PLUGIN Qt5::QMngPlugin LOCATION)
22    get_target_property(TIFF_PLUGIN Qt5::QTiffPlugin LOCATION)
23    get_filename_component(GIF_PLUGIN_NAME "${GIF_PLUGIN}" NAME)
24    get_filename_component(ICO_PLUGIN_NAME "${ICO_PLUGIN}" NAME)
25    get_filename_component(JPEG_PLUGIN_NAME "${JPEG_PLUGIN}" NAME)
27  #get_filename_component(MNG_PLUGIN_NAME "${MNG_PLUGIN}" NAME)
26    get_filename_component(TIFF_PLUGIN_NAME "${TIFF_PLUGIN}" NAME)
27  
28 <  if(APPLE OR WIN32)
29 <    if(WIN32)
30 <      get_target_property(QPA_PLUGIN Qt5::QWindowsIntegrationPlugin LOCATION)
31 <    elseif(APPLE)
32 <      get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
33 <    endif()
36 <    get_filename_component(QPA_PLUGIN_NAME "${QPA_PLUGIN}" NAME)
28 >  if(WIN32)
29 >    get_target_property(QPA_PLUGIN Qt5::QWindowsIntegrationPlugin LOCATION)
30 >  elseif(APPLE)
31 >    get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
32 >  elseif(UNIX)
33 >    get_target_property(QPA_PLUGIN Qt5::QXcbIntegrationPlugin LOCATION)
34    endif()
35 +  get_filename_component(QPA_PLUGIN_NAME "${QPA_PLUGIN}" NAME)
36  
37 <  configure_file(
40 <     "${CMAKE_CURRENT_SOURCE_DIR}/dependencies.cmake.in"
41 <     "${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake"
42 <     @ONLY
43 <     )
37 >  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dependencies.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake" @ONLY)
38    install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake")
39   endif()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines