ViewVC Help

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

root/Development/ray/src/rt/CMakeLists.txt

Comparing ray/src/rt/CMakeLists.txt (file contents):
Revision 1.8 by greg, Tue Jul 31 16:52:32 2012 UTC vs.
Revision 1.9 by greg, Thu Mar 20 22:49:21 2014 UTC

#	Line 22 | Line 22 | target_link_libraries(rtrace raycalls radiance rtrad)
22
23		add_executable(rpict rpmain.c rpict.c srcdraw.c duphead.c persist.c)
24		target_link_libraries(rpict radiance rtrad)
25	+
26	+	add_executable(lookamb lookamb.c ambio.c)
27	+	target_link_libraries(lookamb rtrad)
28	+
29	+	add_executable(rcontrib rcmain.c rcontrib.c rc2.c rc3.c)
30	+	target_link_libraries(rcontrib radiance rtrad)
31	+
32	+	set(targets_to_install lookamb radiance raycalls rtrace rpict rcontrib)
33	+
34		if(X11_FOUND)
35		set(X11_SOURCES x11.c x11twind.c)
36		add_definitions("-DHAS_X11")
#	Line 29 | Line 38 | endif()
38		if(QT4_FOUND)
39		add_definitions("-DHAS_QT")
40		endif()
41	<	add_executable(rvu
42	<	rvmain.c rview.c rv2.c rv3.c devtable.c devcomm.c editline.c ${X11_SOURCES}
43	<	colortab.c)
44	<	target_link_libraries(rvu raycalls radiance rtrad ${X11_LIBRARIES})
45	<	# only link to rvu-qt-lib if qt is found
46	<	if(QT4_FOUND)
47	<	target_link_libraries(rvu qtrvu)
41	>	if (X11_FOUND OR QT4_FOUND)
42	>	add_executable(rvu
43	>	rvmain.c rview.c rv2.c rv3.c devtable.c devcomm.c editline.c ${X11_SOURCES}
44	>	colortab.c)
45	>	target_link_libraries(rvu raycalls radiance rtrad ${X11_LIBRARIES})
46	>	list(APPEND targets_to_install rvu)
47	>
48	>	# only link to rvu-qt-lib if qt is found
49	>	if(QT4_FOUND)
50	>	target_link_libraries(rvu qtrvu)
51	>	endif()
52		endif()
53
41	–	add_executable(lookamb lookamb.c ambio.c)
42	–	target_link_libraries(lookamb rtrad)
43	–
44	–	add_executable(rcontrib rcmain.c rcontrib.c rc2.c rc3.c)
45	–	target_link_libraries(rcontrib radiance rtrad)
46	–
54		add_test(rtrace_Version ${EXECUTABLE_OUTPUT_PATH}/rtrace -version)
55		set_tests_properties(rtrace_Version PROPERTIES
56		PASS_REGULAR_EXPRESSION "RADIANCE")
57
58	<	install(TARGETS lookamb radiance raycalls rtrace rpict rvu rcontrib
58	>	install(TARGETS ${targets_to_install}
59		RUNTIME DESTINATION bin
60		LIBRARY DESTINATION bin
61		ARCHIVE DESTINATION bin)

Diff Legend

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