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.30 by greg, Wed Nov 22 17:12:58 2023 UTC

# Line 1 | Line 1
1 < cmake_minimum_required(VERSION 3.0)
1 > cmake_minimum_required(VERSION 3.12)
2   cmake_policy(SET CMP0020 NEW)
3   cmake_policy(SET CMP0048 NEW)
4 < if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
5 <  cmake_policy(SET CMP0054 NEW)
4 > cmake_policy(SET CMP0054 NEW)
5 > cmake_policy(SET CMP0074 NEW)
6 >
7 > # project-defined modules
8 > set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/resources/cmake/modules")
9 >
10 > # Get the project version.
11 > set(VERSIONFILE "${CMAKE_CURRENT_LIST_DIR}/src/rt/VERSION")
12 > if(EXISTS ${VERSIONFILE})
13 >  file(READ  ${VERSIONFILE} NAMEVERSION)
14 >  if(${NAMEVERSION} MATCHES "^([A-Za-z]+) +([0-9]+\\.[0-9]+)")
15 >    # project name must be lower case, or the CPack module fails
16 >    string(TOLOWER ${CMAKE_MATCH_1} PROGNAME)
17 >    project(${PROGNAME} VERSION ${CMAKE_MATCH_2} LANGUAGES C)
18 >  endif()
19 > else()
20 >  project(radiance LANGUAGES C)  
21   endif()
22  
23 < project(radiance VERSION 5.2.0)
23 > message("Project: " ${CMAKE_PROJECT_NAME} " " ${PROJECT_VERSION})
24  
25   set(PROJECT_VERSION_TWEAK "Unknown" CACHE STRING "Commit Hash")
26   find_package(Git)
# Line 30 | Line 45 | option(BUILD_SHARED_LIBS "Build radiance using shared
45   option(BUILD_HEADLESS "Build radiance without any GUI components?" OFF)
46   option(BUILD_PABOPTO_UTILS "Build PABOpto Utilities?" OFF)
47   option(BUILD_LIBTIFF "Build libtiff?" OFF)
48 + option(BUILD_QT "Build Qt related stuff?" OFF)
49  
50   if(NOT WIN32)
51    set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
52    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/" DESTINATION man)
53 <  set(qt_plugin_term "PLUGIN")
53 >  if(BUILD_QT)
54 >    set(qt_plugin_term "PLUGIN")
55 >  endif()
56   endif()
57  
58   if(WIN32)
59 +  set(CPACK_NSIS_INSTALL_ROOT "C:")
60    set(CPACK_NSIS_MODIFY_PATH 1)
61 <  set(qt_plugin_term "LIBRARY")
61 >  if(BUILD_QT)
62 >    set(qt_plugin_term "LIBRARY")
63 >  endif()
64  
65    # Set RAYPATH on install
66    set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
# Line 59 | Line 80 | else()
80    set(CPACK_PACKAGING_INSTALL_PREFIX "/")
81   endif()
82  
83 < set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
83 > set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
84  
85   if(APPLE)
86    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c11 -std=c++11 -stdlib=libc++")
87    add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
88 <  #include_directories(/usr/X11R6/include)
68 <  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
88 >  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13")
89   endif()
90  
91   if(BUILD_LIBTIFF)
# Line 78 | Line 98 | if(BUILD_LIBTIFF)
98        URL_MD5 ${LIBTIFF_MD5}
99        CMAKE_GENERATOR "NMake Makefiles"
100        CMAKE_ARGS
101 +        "-UHAVE_UNISTD_H"
102          "-DBUILD_SHARED_LIBS=OFF"
103          "-DCMAKE_BUILD_TYPE=Release"
104          "-Dzlib=OFF"
# Line 103 | Line 124 | endif()
124  
125   set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
126   set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
106 set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
127   set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance")
128   set(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
129   set(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
# Line 118 | Line 138 | endif()
138   include(CPack)
139  
140   if(NOT BUILD_HEADLESS)
141 <  find_package(Qt5Widgets)
142 <  get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
143 <  get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
144 <  get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
141 >  if(BUILD_QT)
142 >    find_package(Qt5Widgets)
143 >    get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
144 >    get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
145 >    get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
146 >  endif()
147 >  if(APPLE)
148 >    set(X11_ROOT "/opt/X11")
149 >  endif()
150    find_package(X11)
151    if(APPLE)
152       include_directories(${X11_INCLUDE_DIR})
153 <  endif()
153 >   endif()
154 >   if(APPLE AND X11_FOUND)
155 >     set(CMAKE_FIND_FRAMEWORK NEVER)
156 >     set(OpenGL_ROOT "/opt/X11")
157 >     find_package(OpenGL)
158 >     set(CMAKE_FIND_FRAMEWORK "")
159 >   else()
160 >     find_package(OpenGL)
161 >   endif()
162 >
163   endif()
164  
165   set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
166  
167   if(MSVC)
168    add_definitions(/MP)
169 +  # Suppress warnings about double-to-float assignments and initializations
170 +  add_compile_options(/wd"4244" /wd"4305")
171   endif()
172   if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
173    set(_INTEL_WINDOWS 1)
# Line 152 | Line 188 | add_subdirectory(resources)
188   install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
189    DESTINATION "lib"
190   )
191 +
192 + # copy make tests to build
193 + file(COPY test DESTINATION ${CMAKE_BINARY_DIR})
194 +
195  
196   include(InstallRequiredSystemLibraries)
197   add_subdirectory(InstallRules)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines