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.6 by greg, Tue Jun 19 16:41:46 2012 UTC vs.
Revision 1.10 by greg, Tue Mar 25 21:22:30 2014 UTC

# Line 5 | Line 5 | enable_testing()
5   include(CTest)
6  
7   option(BUILD_SHARED_LIBS "Build radiance using shared libraries?" OFF)
8 + option(BUILD_HEADLESS "Build radiance without any GUI components?" OFF)
9  
10   if(NOT WIN32)
11    set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
# Line 14 | Line 15 | endif()
15  
16  
17   if (WIN32)
18 <
18 <  set(CPACK_NSIS_MODIFY_PATH 0)
19 <
20 <  set(CPACK_BINARY_ZIP 1)
21 <
22 <  set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "")
18 >  set(CPACK_NSIS_MODIFY_PATH 1)
19    set(qt_plugin_term "LIBRARY")
20  
21 +  # Set RAYPATH on install
22 +  set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
23 +    "WriteRegExpandStr HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\" RAYPATH '\\\"$INSTDIR\\\\lib\\\"'"
24 +  )
25 +
26 +  # Unset RAYPATH on uninstall
27 +  set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
28 +    "DeleteRegValue HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\" RAYPATH"
29 +  )
30   endif()
31  
32   if(UNIX)
# Line 34 | Line 39 | endif()
39   if(APPLE)
40    add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
41    include_directories(/usr/X11R6/include)
42 +  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.6")
43   endif()
44  
45 + IF( BUILD_PACKAGE )
46 +  INCLUDE(radianceCPack.cmake )
47 + ENDIF( BUILD_PACKAGE )
48 +
49   set(CPACK_PACKAGE_VERSION_MAJOR 4)
50   set(CPACK_PACKAGE_VERSION_MINOR 2)
51   set(CPACK_PACKAGE_VERSION_PATCH a)
# Line 47 | Line 57 | SET(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR
57  
58   include(CPack)
59  
60 < find_package(Qt4 COMPONENTS QtCore QtGui)
61 < find_package(X11)
60 > if(NOT BUILD_HEADLESS)
61 >  find_package(Qt4 COMPONENTS QtCore QtGui)
62 >  find_package(X11)
63 > endif()
64  
65   SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
66  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines