ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.34 by greg, Sun Sep 28 19:53:23 2025 UTC

# Line 1 | Line 1
1 < cmake_minimum_required(VERSION 3.0)
1 > # RCSid $Id$
2 >
3 > cmake_minimum_required(VERSION 3.12)
4   cmake_policy(SET CMP0020 NEW)
5   cmake_policy(SET CMP0048 NEW)
6 < if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
7 <  cmake_policy(SET CMP0054 NEW)
6 > cmake_policy(SET CMP0054 NEW)
7 > cmake_policy(SET CMP0074 NEW)
8 >
9 > # project-defined modules
10 > set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/resources/cmake/modules")
11 >
12 > set(SUPPORTED_LANGUAGES C CXX)
13 >
14 > # Get the project version.
15 > set(VERSIONFILE "${CMAKE_CURRENT_LIST_DIR}/src/rt/VERSION")
16 > if(EXISTS ${VERSIONFILE})
17 >  file(READ  ${VERSIONFILE} NAMEVERSION)
18 >  if(${NAMEVERSION} MATCHES "^([A-Za-z]+) +([0-9]+\\.[0-9]+)")
19 >    # project name must be lower case, or the CPack module fails
20 >    string(TOLOWER ${CMAKE_MATCH_1} PROGNAME)
21 >    project(${PROGNAME} VERSION ${CMAKE_MATCH_2} LANGUAGES ${SUPPORTED_LANGUAGES})
22 >  endif()
23 > else()
24 >    project(radiance LANGUAGES ${SUPPORTED_LANGUAGES})
25   endif()
26  
27 < project(radiance VERSION 5.2.0)
27 > message("Project: " ${CMAKE_PROJECT_NAME} " " ${PROJECT_VERSION})
28  
29   set(PROJECT_VERSION_TWEAK "Unknown" CACHE STRING "Commit Hash")
30   find_package(Git)
# Line 30 | Line 49 | option(BUILD_SHARED_LIBS "Build radiance using shared
49   option(BUILD_HEADLESS "Build radiance without any GUI components?" OFF)
50   option(BUILD_PABOPTO_UTILS "Build PABOpto Utilities?" OFF)
51   option(BUILD_LIBTIFF "Build libtiff?" OFF)
52 + option(BUILD_QT "Build Qt related stuff?" OFF)
53  
54   if(NOT WIN32)
55    set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
56    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/" DESTINATION man)
57 <  set(qt_plugin_term "PLUGIN")
57 >  if(BUILD_QT)
58 >    set(qt_plugin_term "PLUGIN")
59 >  endif()
60   endif()
61  
62   if(WIN32)
63 +  set(CPACK_NSIS_INSTALL_ROOT "C:")
64    set(CPACK_NSIS_MODIFY_PATH 1)
65 <  set(qt_plugin_term "LIBRARY")
65 >  if(BUILD_QT)
66 >    set(qt_plugin_term "LIBRARY")
67 >  endif()
68  
69    # Set RAYPATH on install
70    set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
# Line 59 | Line 84 | else()
84    set(CPACK_PACKAGING_INSTALL_PREFIX "/")
85   endif()
86  
87 < set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
87 > set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
88  
89   if(APPLE)
90    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c11 -std=c++11 -stdlib=libc++")
91 +  add_compile_options(-O2 -DBSD -DNOSTEREO -Dfreebsd)
92    add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
93 <  #include_directories(/usr/X11R6/include)
68 <  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
93 >  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13")
94   endif()
95  
96   if(BUILD_LIBTIFF)
97    include(ExternalProject)
98 <  set(LIBTIFF_URL http://download.osgeo.org/libtiff/tiff-4.0.9.tar.gz)
99 <  set(LIBTIFF_MD5 54BAD211279CC93EB4FCA31BA9BFDC79)
98 >  set(LIBTIFF_URL http://download.osgeo.org/libtiff/tiff-4.7.0.tar.gz)
99 >  set(LIBTIFF_MD5 3A0FA4A270A4A192B08913F88D0CFBDD)
100    if(WIN32)
101      ExternalProject_Add(libtiff
102        URL ${LIBTIFF_URL}
# Line 80 | Line 105 | if(BUILD_LIBTIFF)
105        CMAKE_ARGS
106          "-DBUILD_SHARED_LIBS=OFF"
107          "-DCMAKE_BUILD_TYPE=Release"
108 +        "-Djpeg=OFF"
109          "-Dzlib=OFF"
110 +        "-Dwebp=OFF"
111 +        "-Dlzma=OFF"
112 +        "-Dtiff-tools=OFF"
113 +        "-Dtiff-tests=OFF"
114 +        "-Dtiff-docs=OFF"
115          "../libtiff"
116        INSTALL_COMMAND ""
117      )
# Line 92 | Line 123 | if(BUILD_LIBTIFF)
123        CMAKE_ARGS
124          "-DBUILD_SHARED_LIBS=OFF"
125          "-DCMAKE_BUILD_TYPE=Release"
126 +        "-Djpeg=OFF"
127          "-Dzlib=OFF"
128 +        "-Dwebp=OFF"
129 +        "-Dlzma=OFF"
130 +        "-Dtiff-tools=OFF"
131 +        "-Dtiff-tests=OFF"
132 +        "-Dtiff-docs=OFF"
133          "../libtiff"
134        INSTALL_COMMAND ""
135      )
# Line 103 | Line 140 | endif()
140  
141   set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
142   set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
106 – set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
143   set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance")
144   set(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
145   set(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
# Line 118 | Line 154 | endif()
154   include(CPack)
155  
156   if(NOT BUILD_HEADLESS)
157 <  find_package(Qt5Widgets)
158 <  get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
159 <  get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
160 <  get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
157 >  if(BUILD_QT)
158 >    find_package(Qt5Widgets)
159 >    get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
160 >    get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
161 >    get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
162 >  endif()
163 >  if(APPLE)
164 >    set(X11_ROOT "/opt/X11")
165 >  endif()
166    find_package(X11)
167    if(APPLE)
168       include_directories(${X11_INCLUDE_DIR})
169 <  endif()
169 >   endif()
170 >   if(APPLE AND X11_FOUND)
171 >     set(CMAKE_FIND_FRAMEWORK NEVER)
172 >     set(OpenGL_ROOT "/opt/X11")
173 >     find_package(OpenGL)
174 >     set(CMAKE_FIND_FRAMEWORK "")
175 >   else()
176 >     find_package(OpenGL)
177 >   endif()
178 >
179   endif()
180  
181   set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
182  
183   if(MSVC)
184    add_definitions(/MP)
185 +  # Suppress warnings about double-to-float assignments and initializations
186 +  add_compile_options(/wd"4244" /wd"4305")
187   endif()
188   if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
189    set(_INTEL_WINDOWS 1)
# Line 152 | Line 204 | add_subdirectory(resources)
204   install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
205    DESTINATION "lib"
206   )
207 +
208 + # copy make tests to build
209 + file(COPY test DESTINATION ${CMAKE_BINARY_DIR})
210 +
211  
212   include(InstallRequiredSystemLibraries)
213   add_subdirectory(InstallRules)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines