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

Comparing ray/CMakeLists.txt (file contents):
Revision 1.22 by greg, Wed Apr 3 20:18:54 2019 UTC vs.
Revision 1.25 by greg, Wed Jan 11 23:18:57 2023 UTC

# Line 34 | Line 34 | option(BUILD_LIBTIFF "Build libtiff?" OFF)
34   if(NOT WIN32)
35    set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
36    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/" DESTINATION man)
37 <  set(qt_plugin_term "PLUGIN")
37 >  # set(qt_plugin_term "PLUGIN")
38   endif()
39  
40   if(WIN32)
41 +  set(CPACK_NSIS_INSTALL_ROOT "C:")
42    set(CPACK_NSIS_MODIFY_PATH 1)
43    set(qt_plugin_term "LIBRARY")
44  
# Line 77 | Line 78 | if(BUILD_LIBTIFF)
78        URL_MD5 ${LIBTIFF_MD5}
79        CMAKE_GENERATOR "NMake Makefiles"
80        CMAKE_ARGS
81 +        "-UHAVE_UNISTD_H"
82          "-DBUILD_SHARED_LIBS=OFF"
83          "-DCMAKE_BUILD_TYPE=Release"
84          "-Dzlib=OFF"
# Line 116 | Line 118 | endif()
118   include(CPack)
119  
120   if(NOT BUILD_HEADLESS)
121 <  find_package(Qt5Widgets)
122 <  get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
123 <  get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
124 <  get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
121 >    # find_package(Qt5Widgets)
122 >    # get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
123 >    # get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
124 >    # get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
125    find_package(X11)
126    if(APPLE)
127       include_directories(${X11_INCLUDE_DIR})
# Line 130 | Line 132 | set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
132  
133   if(MSVC)
134    add_definitions(/MP)
135 +  # Suppress warnings about double-to-float assignments and initializations
136 +  add_compile_options(/wd"4244" /wd"4305")
137   endif()
138   if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
139    set(_INTEL_WINDOWS 1)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines