Merge commit '6481cc3d7534a34435e88d343eb5f499001032a0'

cmake/nested_targets/DCubed/CMakeLists.txt

@@ -0,0 +1,31 @@
+# - Build the DCubed wrapper libraries as a part of your solution.
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file ../../LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+
+include_directories("${DCUBED_CORE_INCLUDE_DIR}/d3e_inc" "${DCUBED_WRAPPER_INCLUDE_DIR}")
+
+include_directories(${PARASOLID_INCLUDE_DIRS})
+if(MSVC)
+	add_definitions(/D_CRT_SECURE_NO_DEPRECATE /arch:SSE2 /openmp /D_AFXDLL /DNDEBUG)
+endif()
+if(WIN32)
+	add_definitions(/DDCM_NT /DWIN32 /D_WINDOWS)
+endif()
+add_definitions(/DD3EW_DUMMY_HLM)
+
+if(DCUBED_WRAPPER_d3ew_scene_LIBRARY STREQUAL "dcubed_wrapper_d3ew_scene_nested_target")
+	add_subdirectory(d3ew_scene)
+endif()
+
+if(DCUBED_WRAPPER_d3ew_p_LIBRARY STREQUAL "dcubed_wrapper_d3ew_p_nested_target")
+	add_subdirectory(d3ew_p)
+endif()

cmake/nested_targets/DCubed/d3ew_p/CMakeLists.txt

@@ -0,0 +1,41 @@
+# - Build the DCubed wrapper library d3ew_p as a part of your solution.
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file ../../LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+
+set(SOURCES)
+foreach(filename d3ew_p.rc
+	p_dll.cpp
+	p_dll.hxx
+	p_dump.cpp
+	p_frustrum.cpp
+	p_gate.cpp
+	p_gate.hxx
+	p_lib.cpp
+	p_modeller.cpp
+	p_new.hxx
+	p_rollmark.cpp
+	p_utils.cpp
+	p_utils.hxx
+	res_defs.hxx)
+	list(APPEND SOURCES "${DCUBED_WRAPPER_INCLUDE_DIR}/d3ew_p/${filename}")
+endforeach()
+add_library(dcubed_wrapper_d3ew_p_nested_target
+	STATIC
+	EXCLUDE_FROM_ALL
+	${SOURCES})
+target_link_libraries(dcubed_wrapper_d3ew_p_nested_target ${DCUBED_LIBRARIES} ${PARASOLID_LIBRARIES} "${DCUBED_WRAPPER_d3ew_scene_LIBRARY}")
+
+set_property(TARGET
+	dcubed_wrapper_d3ew_p_nested_target
+	PROPERTY
+	PROJECT_LABEL
+	"DCubed d3ew_p Wrapper Library")

cmake/nested_targets/DCubed/d3ew_scene/CMakeLists.txt

@@ -0,0 +1,69 @@
+# - Build the DCubed wrapper library d3ew_scene as a part of your solution.
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file ../../LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+
+set(SOURCES)
+foreach(filename ansi.hxx
+	body.hxx
+	d3ew_clap_data.cpp
+	d3ew_clap_data.hxx
+	d3ew_new.hxx
+	d3ew_stack.cpp
+	d3ew_stack.hxx
+	debload.hxx
+	edge.cpp
+	edge.hxx
+	ehlc_timer.cpp
+	ehlc_timer.hxx
+	face.cpp
+	face.hxx
+	files.txt
+	frustum.cpp
+	frustum.hxx
+	hldeb.hxx
+	hljournal.hxx
+	hlm_cdm_dummies.cpp
+	hltable.hxx
+	hltabledef.hxx
+	journalw.cpp
+	journalw.hxx
+	modeller.cpp
+	modeller.hxx
+	nowarn.hxx
+	scene.cpp
+	scene.hxx
+	scene_build.cpp
+	scene_edge.cpp
+	scene_face.cpp
+	scene_misc.cpp
+	scene_node.cpp
+	scene_node.hxx
+	scene_table.cpp
+	scene_table.hxx
+	secure_c.hxx
+	segment.cpp
+	segment.hxx
+	table_dec.hxx
+	wrapper.cpp
+	wrapper_new.cpp)
+	list(APPEND SOURCES "${DCUBED_WRAPPER_INCLUDE_DIR}/d3ew_scene/${filename}")
+endforeach()
+add_library(dcubed_wrapper_d3ew_scene_nested_target
+	STATIC
+	EXCLUDE_FROM_ALL
+	${SOURCES})
+
+set_property(TARGET
+	dcubed_wrapper_d3ew_scene_nested_target
+	PROPERTY
+	PROJECT_LABEL
+	"DCubed d3ew_scene Wrapper Library")