--- ray/CMakeLists.txt	2012/05/30 18:31:11	1.5
+++ ray/CMakeLists.txt	2014/03/20 22:49:21	1.9
@@ -5,10 +5,12 @@ enable_testing()
 include(CTest)
 
 option(BUILD_SHARED_LIBS "Build radiance using shared libraries?" OFF)
+option(BUILD_HEADLESS "Build radiance without any GUI components?" OFF)
 
 if(NOT WIN32)
   set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
   install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/man/ DESTINATION man)
+  set(qt_plugin_term "PLUGIN")
 endif()
 
 
@@ -19,6 +21,7 @@ if (WIN32)
   set(CPACK_BINARY_ZIP 1)
 
   set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "")
+  set(qt_plugin_term "LIBRARY")
 
 endif()
 
@@ -32,8 +35,13 @@ endif()
 if(APPLE)
   add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
   include_directories(/usr/X11R6/include)
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.6")
 endif()
 
+IF( BUILD_PACKAGE )
+  INCLUDE(radianceCPack.cmake )
+ENDIF( BUILD_PACKAGE )
+
 set(CPACK_PACKAGE_VERSION_MAJOR 4)
 set(CPACK_PACKAGE_VERSION_MINOR 2)
 set(CPACK_PACKAGE_VERSION_PATCH a)
@@ -45,8 +53,10 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR
 
 include(CPack)
 
-find_package(Qt4 COMPONENTS QtCore QtGui)
-find_package(X11)
+if(NOT BUILD_HEADLESS)
+  find_package(Qt4 COMPONENTS QtCore QtGui)
+  find_package(X11)
+endif()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)