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.19 by greg, Mon Jan 8 16:51:31 2018 UTC vs.
Revision 1.23 by greg, Fri Jul 17 16:05:05 2020 UTC

# Line 38 | Line 38 | if(NOT WIN32)
38   endif()
39  
40   if(WIN32)
41 +  set(CPACK_NSIS_INSTALL_ROOT "C:")
42    set(CPACK_NSIS_MODIFY_PATH 1)
43    set(qt_plugin_term "LIBRARY")
44  
# Line 59 | Line 60 | else()
60    set(CPACK_PACKAGING_INSTALL_PREFIX "/")
61   endif()
62  
63 < set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
63 > set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
64  
65   if(APPLE)
66    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c11 -std=c++11 -stdlib=libc++")
67    add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
67  include_directories(/usr/X11R6/include)
68    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
69   endif()
70  
# Line 103 | Line 103 | endif()
103  
104   set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
105   set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
106 set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
106   set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance")
107   set(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
108   set(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
# Line 123 | Line 122 | if(NOT BUILD_HEADLESS)
122    get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
123    get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
124    find_package(X11)
125 +  if(APPLE)
126 +     include_directories(${X11_INCLUDE_DIR})
127 +  endif()
128   endif()
129  
130   set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
# Line 149 | Line 151 | add_subdirectory(resources)
151   install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
152    DESTINATION "lib"
153   )
154 +
155 + # copy make tests to build
156 + file(COPY test DESTINATION ${CMAKE_BINARY_DIR})
157 +
158  
159   include(InstallRequiredSystemLibraries)
160   add_subdirectory(InstallRules)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines