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.25 by greg, Wed Jan 11 23:18:57 2023 UTC vs.
Revision 1.29 by greg, Sat Nov 18 17:25:18 2023 UTC

# Line 1 | Line 1
1 < cmake_minimum_required(VERSION 3.0)
1 > cmake_minimum_required(VERSION 3.5)
2   cmake_policy(SET CMP0020 NEW)
3   cmake_policy(SET CMP0048 NEW)
4   if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
# Line 30 | Line 30 | option(BUILD_SHARED_LIBS "Build radiance using shared
30   option(BUILD_HEADLESS "Build radiance without any GUI components?" OFF)
31   option(BUILD_PABOPTO_UTILS "Build PABOpto Utilities?" OFF)
32   option(BUILD_LIBTIFF "Build libtiff?" OFF)
33 + option(BUILD_QT "Build Qt related stuff?" OFF)
34  
35   if(NOT WIN32)
36    set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
37    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/" DESTINATION man)
38 <  # set(qt_plugin_term "PLUGIN")
38 >  if(BUILD_QT)
39 >    set(qt_plugin_term "PLUGIN")
40 >  endif()
41   endif()
42  
43   if(WIN32)
44    set(CPACK_NSIS_INSTALL_ROOT "C:")
45    set(CPACK_NSIS_MODIFY_PATH 1)
46 <  set(qt_plugin_term "LIBRARY")
46 >  if(BUILD_QT)
47 >    set(qt_plugin_term "LIBRARY")
48 >  endif()
49  
50    # Set RAYPATH on install
51    set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
# Line 65 | Line 70 | set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${P
70   if(APPLE)
71    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c11 -std=c++11 -stdlib=libc++")
72    add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
73 <  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
73 >  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")
74   endif()
75  
76   if(BUILD_LIBTIFF)
# Line 118 | Line 123 | endif()
123   include(CPack)
124  
125   if(NOT BUILD_HEADLESS)
126 <    # find_package(Qt5Widgets)
127 <    # get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
128 <    # get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
129 <    # get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
126 >  if(BUILD_QT)
127 >    find_package(Qt5Widgets)
128 >    get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
129 >    get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
130 >    get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
131 >  endif()
132    find_package(X11)
133    if(APPLE)
134       include_directories(${X11_INCLUDE_DIR})

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines