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.21 by greg, Wed Jun 20 20:51:24 2018 UTC

# Line 59 | Line 59 | else()
59    set(CPACK_PACKAGING_INSTALL_PREFIX "/")
60   endif()
61  
62 < set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
62 > set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
63  
64   if(APPLE)
65    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c11 -std=c++11 -stdlib=libc++")
66    add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
67  #include_directories(/usr/X11R6/include)
67    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
68   endif()
69  
# Line 103 | Line 102 | endif()
102  
103   set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
104   set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
106 set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
105   set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance")
106   set(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
107   set(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines