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.20 by greg, Wed Jun 20 03:04:44 2018 UTC vs.
Revision 1.26 by greg, Wed Jan 11 23:31:17 2023 UTC

# Line 38 | Line 38 | if(NOT WIN32)
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 59 | Line 60 | else()
60    set(CPACK_PACKAGING_INSTALL_PREFIX "/")
61   endif()
62  
63 < set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
63 > set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
64  
65   if(APPLE)
66    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c11 -std=c++11 -stdlib=libc++")
67    add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
67  #include_directories(/usr/X11R6/include)
68    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
69   endif()
70  
# Line 78 | 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 103 | Line 104 | endif()
104  
105   set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
106   set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
106 set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
107   set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance")
108   set(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
109   set(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
# Line 118 | 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 132 | 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)
# Line 152 | Line 154 | add_subdirectory(resources)
154   install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
155    DESTINATION "lib"
156   )
157 +
158 + # copy make tests to build
159 + file(COPY test DESTINATION ${CMAKE_BINARY_DIR})
160 +
161  
162   include(InstallRequiredSystemLibraries)
163   add_subdirectory(InstallRules)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines