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

# Line 14 | Line 14 | if(TIFF_LIBRARY)
14    endif()
15   endif()
16  
17 < #plugins loaded by rvu at runtime
18 < get_target_property(GIF_PLUGIN Qt5::QGifPlugin LOCATION)
19 < get_target_property(ICO_PLUGIN Qt5::QICOPlugin LOCATION)
20 < get_target_property(JPEG_PLUGIN Qt5::QJpegPlugin LOCATION)
21 < 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)
26 < get_filename_component(MNG_PLUGIN_NAME "${MNG_PLUGIN}" NAME)
27 < get_filename_component(TIFF_PLUGIN_NAME "${TIFF_PLUGIN}" NAME)
17 > if(NOT BUILD_HEADLESS)
18 >  #plugins loaded by rvu at runtime
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)
23 >  get_target_property(TIFF_PLUGIN Qt5::QTiffPlugin LOCATION)
24 >  get_filename_component(GIF_PLUGIN_NAME "${GIF_PLUGIN}" NAME)
25 >  get_filename_component(ICO_PLUGIN_NAME "${ICO_PLUGIN}" NAME)
26 >  get_filename_component(JPEG_PLUGIN_NAME "${JPEG_PLUGIN}" NAME)
27 >  get_filename_component(MNG_PLUGIN_NAME "${MNG_PLUGIN}" NAME)
28 >  get_filename_component(TIFF_PLUGIN_NAME "${TIFF_PLUGIN}" NAME)
29  
30 < if(APPLE OR WIN32)
31 <  if(WIN32)
32 <    get_target_property(QPA_PLUGIN Qt5::QWindowsIntegrationPlugin LOCATION)
33 <  elseif(APPLE)
34 <    get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
30 >  if(APPLE OR WIN32)
31 >    if(WIN32)
32 >      get_target_property(QPA_PLUGIN Qt5::QWindowsIntegrationPlugin LOCATION)
33 >    elseif(APPLE)
34 >      get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
35 >    endif()
36 >    get_filename_component(QPA_PLUGIN_NAME "${QPA_PLUGIN}" NAME)
37    endif()
35  get_filename_component(QPA_PLUGIN_NAME "${QPA_PLUGIN}" NAME)
36 endif()
38  
39 < configure_file(
40 <   "${CMAKE_CURRENT_SOURCE_DIR}/dependencies.cmake.in"
41 <   "${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake"
42 <   @ONLY
43 <   )
44 < install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake")
45 <
39 >  configure_file(
40 >     "${CMAKE_CURRENT_SOURCE_DIR}/dependencies.cmake.in"
41 >     "${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake"
42 >     @ONLY
43 >     )
44 >  install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake")
45 > endif()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines