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.13 by greg, Tue Mar 22 21:36:24 2016 UTC vs.
Revision 1.14 by greg, Fri Sep 30 17:59:27 2016 UTC

#	Line 1 | Line 1
1		set(VERSION_FILE "${radiance_BINARY_DIR}/src/rt/Version.c")
2		create_version_file("${VERSION_FILE}")
3
4	<	add_library(radiance
5	<	ambcomp.c ambient.c ambio.c aniso.c ashikhmin.c data.c dielectric.c fprism.c freeobjmem.c
6	<	func.c glass.c initotypes.c m_alias.c m_brdf.c m_bsdf.c m_clip.c m_direct.c
7	<	m_mirror.c m_mist.c mx_func.c mx_data.c noise3.c normal.c o_face.c o_cone.c
8	<	o_instance.c o_mesh.c p_data.c p_func.c preload.c raytrace.c renderopts.c
9	<	source.c sphere.c srcobstr.c srcsupp.c srcsamp.c t_data.c t_func.c text.c
10	<	pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c
11	<	pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c
12	<	pmapdata.c pmapdiag.c pmaptype.c
13	<	"${VERSION_FILE}" virtuals.c)
4	>	if(WIN32)
5
6	+	add_library(radiance
7	+	ambcomp.c ambient.c ambio.c aniso.c ashikhmin.c data.c dielectric.c fprism.c freeobjmem.c
8	+	func.c glass.c initotypes.c m_alias.c m_brdf.c m_bsdf.c m_clip.c m_direct.c
9	+	m_mirror.c m_mist.c mx_func.c mx_data.c noise3.c normal.c o_face.c o_cone.c
10	+	o_instance.c o_mesh.c p_data.c p_func.c preload.c raytrace.c renderopts.c
11	+	source.c sphere.c srcobstr.c srcsupp.c srcsamp.c t_data.c t_func.c text.c
12	+	pmapsrc.c pmapmat.c pmaprand.c pmapio.c
13	+	pmapbias.c pmapparm.c pmapamb.c pmapray.c pmapopt.c
14	+	pmapdata.c pmapdiag.c pmaptype.c pmutil.c pmcontrib2.c
15	+	"${VERSION_FILE}" virtuals.c)
16	+
17	+	else()
18	+
19	+	add_library(radiance
20	+	ambcomp.c ambient.c ambio.c aniso.c ashikhmin.c data.c dielectric.c fprism.c freeobjmem.c
21	+	func.c glass.c initotypes.c m_alias.c m_brdf.c m_bsdf.c m_clip.c m_direct.c
22	+	m_mirror.c m_mist.c mx_func.c mx_data.c noise3.c normal.c o_face.c o_cone.c
23	+	o_instance.c o_mesh.c p_data.c p_func.c preload.c raytrace.c renderopts.c
24	+	source.c sphere.c srcobstr.c srcsupp.c srcsamp.c t_data.c t_func.c text.c
25	+	pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c
26	+	pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c
27	+	pmapdata.c pmapdiag.c pmaptype.c pmutil.c pmcontrib2.c
28	+	"${VERSION_FILE}" virtuals.c)
29	+
30	+	endif()
31	+
32		if(WIN32)
33		set(rayp_SOURCES raypwin.c)
34		else()
#	Line 32 | Line 49 | target_link_libraries(lookamb rtrad)
49		add_executable(rcontrib rcmain.c rcontrib.c rc2.c rc3.c)
50		target_link_libraries(rcontrib radiance rtrad)
51
52	<	add_executable(mkpmap mkpmap.c)
53	<	target_link_libraries(mkpmap radiance rtrad)
52	>	if(NOT WIN32)
53	>	add_executable(mkpmap mkpmap.c)
54	>	target_link_libraries(mkpmap radiance rtrad)
55	>	add_executable(pmapdump pmapdump.c pmaptype.c pmapparm.c)
56	>	target_link_libraries(pmapdump radiance rtrad)
57	>	endif()
58
59	<	add_executable(pmapdump pmapdump.c pmaptype.c pmapparm.c)
60	<	target_link_libraries(pmapdump radiance rtrad)
61	<
62	<	set(targets_to_install lookamb radiance raycalls rtrace rpict rcontrib mkpmap pmapdump)
59	>	set(targets_to_install lookamb radiance raycalls rtrace rpict rcontrib)
60	>	if(NOT WIN32)
61	>	set(targets_to_install ${targets_to_install} mkpmap pmapdump)
62	>	endif()
63
64		if(X11_FOUND)
65		set(X11_SOURCES x11.c x11twind.c)

Diff Legend

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