ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/CMakeLists.txt

Comparing ray/CMakeLists.txt (file contents):
Revision 1.5 by greg, Wed May 30 18:31:11 2012 UTC vs.
Revision 1.9 by greg, Thu Mar 20 22:49:21 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)
12		install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/man/ DESTINATION man)
13	+	set(qt_plugin_term "PLUGIN")
14		endif()
15
16
#	Line 19 | Line 21 | if (WIN32)
21		set(CPACK_BINARY_ZIP 1)
22
23		set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "")
24	+	set(qt_plugin_term "LIBRARY")
25
26		endif()
27
#	Line 32 | Line 35 | endif()
35		if(APPLE)
36		add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
37		include_directories(/usr/X11R6/include)
38	+	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.6")
39		endif()
40
41	+	IF( BUILD_PACKAGE )
42	+	INCLUDE(radianceCPack.cmake )
43	+	ENDIF( BUILD_PACKAGE )
44	+
45		set(CPACK_PACKAGE_VERSION_MAJOR 4)
46		set(CPACK_PACKAGE_VERSION_MINOR 2)
47		set(CPACK_PACKAGE_VERSION_PATCH a)
#	Line 45 | Line 53 | SET(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR
53
54		include(CPack)
55
56	<	find_package(Qt4 COMPONENTS QtCore QtGui)
57	<	find_package(X11)
56	>	if(NOT BUILD_HEADLESS)
57	>	find_package(Qt4 COMPONENTS QtCore QtGui)
58	>	find_package(X11)
59	>	endif()
60
61		SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
62

Diff Legend

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