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.29 by greg, Sat Nov 18 17:25:18 2023 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.5)
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 70 | Line 85 | set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${P
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 <  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")
88 >  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13")
89   endif()
90  
91   if(BUILD_LIBTIFF)
# Line 129 | Line 144 | if(NOT BUILD_HEADLESS)
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)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines