--- ray/CMakeLists.txt	2023/01/11 23:31:17	1.26
+++ ray/CMakeLists.txt	2023/12/05 21:47:27	1.31
@@ -1,11 +1,28 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12)
 cmake_policy(SET CMP0020 NEW)
 cmake_policy(SET CMP0048 NEW)
-if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
-  cmake_policy(SET CMP0054 NEW)
+cmake_policy(SET CMP0054 NEW)
+cmake_policy(SET CMP0074 NEW)
+
+# project-defined modules
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/resources/cmake/modules")
+
+set(SUPPORTED_LANGUAGES C CXX)
+
+# Get the project version.
+set(VERSIONFILE "${CMAKE_CURRENT_LIST_DIR}/src/rt/VERSION")
+if(EXISTS ${VERSIONFILE})
+  file(READ  ${VERSIONFILE} NAMEVERSION)
+  if(${NAMEVERSION} MATCHES "^([A-Za-z]+) +([0-9]+\\.[0-9]+)")
+    # project name must be lower case, or the CPack module fails
+    string(TOLOWER ${CMAKE_MATCH_1} PROGNAME)
+    project(${PROGNAME} VERSION ${CMAKE_MATCH_2} LANGUAGES ${SUPPORTED_LANGUAGES})
+  endif()
+else()
+    project(radiance LANGUAGES ${SUPPORTED_LANGUAGES})
 endif()
 
-project(radiance VERSION 5.2.0)
+message("Project: " ${CMAKE_PROJECT_NAME} " " ${PROJECT_VERSION})
 
 set(PROJECT_VERSION_TWEAK "Unknown" CACHE STRING "Commit Hash")
 find_package(Git)
@@ -30,17 +47,22 @@ option(BUILD_SHARED_LIBS "Build radiance using shared 
 option(BUILD_HEADLESS "Build radiance without any GUI components?" OFF)
 option(BUILD_PABOPTO_UTILS "Build PABOpto Utilities?" OFF)
 option(BUILD_LIBTIFF "Build libtiff?" OFF)
+option(BUILD_QT "Build Qt related stuff?" OFF)
 
 if(NOT WIN32)
   set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
   install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/" DESTINATION man)
-  set(qt_plugin_term "PLUGIN")
+  if(BUILD_QT)
+    set(qt_plugin_term "PLUGIN")
+  endif()
 endif()
 
 if(WIN32)
   set(CPACK_NSIS_INSTALL_ROOT "C:")
   set(CPACK_NSIS_MODIFY_PATH 1)
-  set(qt_plugin_term "LIBRARY")
+  if(BUILD_QT)
+    set(qt_plugin_term "LIBRARY")
+  endif()
 
   # Set RAYPATH on install
   set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
@@ -65,7 +87,7 @@ set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${P
 if(APPLE)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c11 -std=c++11 -stdlib=libc++")
   add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13")
 endif()
 
 if(BUILD_LIBTIFF)
@@ -118,14 +140,28 @@ endif()
 include(CPack)
 
 if(NOT BUILD_HEADLESS)
+  if(BUILD_QT)
     find_package(Qt5Widgets)
     get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
     get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
     get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
+  endif()
+  if(APPLE)
+    set(X11_ROOT "/opt/X11")
+  endif()
   find_package(X11)
   if(APPLE)
      include_directories(${X11_INCLUDE_DIR})
-  endif()
+   endif()
+   if(APPLE AND X11_FOUND)
+     set(CMAKE_FIND_FRAMEWORK NEVER)
+     set(OpenGL_ROOT "/opt/X11")
+     find_package(OpenGL)
+     set(CMAKE_FIND_FRAMEWORK "")
+   else()
+     find_package(OpenGL)
+   endif()
+
 endif()
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)