ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.20 by greg, Wed Jun 20 03:04:44 2018 UTC

# Line 64 | Line 64 | set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${P
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 >  #include_directories(/usr/X11R6/include)
68    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
69   endif()
70  
# Line 123 | Line 123 | if(NOT BUILD_HEADLESS)
123    get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
124    get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
125    find_package(X11)
126 +  if(APPLE)
127 +     include_directories(${X11_INCLUDE_DIR})
128 +  endif()
129   endif()
130  
131   set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)