Revision: 40537
http://brlcad.svn.sourceforge.net/brlcad/?rev=40537&view=rev
Author: starseeker
Date: 2010-09-10 21:52:01 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
More cleanups driven by diffs between autotools and cmake installs. Getting
close to complete - virtually all remaining diff are explained by expected
differences.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/irprep/CMakeLists.txt
brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
brlcad/branches/cmake/src/other/step/data/CMakeLists.txt
brlcad/branches/cmake/src/vfont/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-10 21:31:53 UTC (rev
40536)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-10 21:52:01 UTC (rev
40537)
@@ -1496,7 +1496,6 @@
INSTALL
NEWS
README
- TODO
)
INSTALL(FILES ${toplevel_DOCFILES} DESTINATION ${BRLCAD_INSTALL_DATA_DIR})
Modified: brlcad/branches/cmake/src/irprep/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/irprep/CMakeLists.txt 2010-09-10 21:31:53 UTC
(rev 40536)
+++ brlcad/branches/cmake/src/irprep/CMakeLists.txt 2010-09-10 21:52:01 UTC
(rev 40537)
@@ -29,11 +29,11 @@
${irprep_X_MANS}
firpass.1
ir-sgi.1
- pictsgi.1
- pictx.1
secpass.1
shapefact.1
showtherm.1
)
+# pictsgi.1
+# pictx.1
install(FILES ${irprep_MANS} DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man1)
Modified: brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2010-09-10
21:31:53 UTC (rev 40536)
+++ brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2010-09-10
21:52:01 UTC (rev 40537)
@@ -112,8 +112,114 @@
opennurbs_zlib.cpp
)
-file(GLOB OPENNURBS_HEADERS *.h)
+SET(OPENNURBS_HEADERS
+ opennurbs.h
+ opennurbs_3dm.h
+ opennurbs_3dm_attributes.h
+ opennurbs_3dm_properties.h
+ opennurbs_3dm_settings.h
+ opennurbs_annotation.h
+ opennurbs_annotation2.h
+ opennurbs_arc.h
+ opennurbs_arccurve.h
+ opennurbs_archive.h
+ opennurbs_array.h
+ opennurbs_array_defs.h
+ opennurbs_base32.h
+ opennurbs_base64.h
+ opennurbs_beam.h
+ opennurbs_bezier.h
+ opennurbs_bitmap.h
+ opennurbs_bounding_box.h
+ opennurbs_box.h
+ opennurbs_brep.h
+ opennurbs_circle.h
+ opennurbs_color.h
+ opennurbs_cone.h
+ opennurbs_crashtest.h
+ opennurbs_crc.h
+ opennurbs_curve.h
+ opennurbs_curveonsurface.h
+ opennurbs_curveproxy.h
+ opennurbs_cylinder.h
+ opennurbs_defines.h
+ opennurbs_detail.h
+ opennurbs_dimstyle.h
+ opennurbs_ellipse.h
+ opennurbs_error.h
+ opennurbs_evaluate_nurbs.h
+ opennurbs_extensions.h
+ opennurbs_font.h
+ opennurbs_fpoint.h
+ opennurbs_geometry.h
+ opennurbs_gl.h
+ opennurbs_group.h
+ opennurbs_hatch.h
+ opennurbs_instance.h
+ opennurbs_intersect.h
+ opennurbs_knot.h
+ opennurbs_layer.h
+ opennurbs_light.h
+ opennurbs_line.h
+ opennurbs_linecurve.h
+ opennurbs_linestyle.h
+ opennurbs_linetype.h
+ opennurbs_lookup.h
+ opennurbs_mapchan.h
+ opennurbs_massprop.h
+ opennurbs_material.h
+ opennurbs_math.h
+ opennurbs_matrix.h
+ opennurbs_memory.h
+ opennurbs_mesh.h
+ opennurbs_nurbscurve.h
+ opennurbs_nurbssurface.h
+ opennurbs_object.h
+ opennurbs_object_history.h
+ opennurbs_objref.h
+ opennurbs_offsetsurface.h
+ opennurbs_optimize.h
+ opennurbs_plane.h
+ opennurbs_planesurface.h
+ opennurbs_pluginlist.h
+ opennurbs_point.h
+ opennurbs_pointcloud.h
+ opennurbs_pointgeometry.h
+ opennurbs_pointgrid.h
+ opennurbs_polycurve.h
+ opennurbs_polyedgecurve.h
+ opennurbs_polyline.h
+ opennurbs_polylinecurve.h
+ opennurbs_quaternion.h
+ opennurbs_rand.h
+ opennurbs_rendering.h
+ opennurbs_revsurface.h
+ opennurbs_rtree.h
+ opennurbs_sphere.h
+ opennurbs_staticlib_linking_pragmas.h
+ opennurbs_string.h
+ opennurbs_sumsurface.h
+ opennurbs_surface.h
+ opennurbs_surfaceproxy.h
+ opennurbs_system.h
+ opennurbs_textlog.h
+ opennurbs_texture.h
+ opennurbs_texture_mapping.h
+ opennurbs_torus.h
+ opennurbs_userdata.h
+ opennurbs_uuid.h
+ opennurbs_version.h
+ opennurbs_viewport.h
+ opennurbs_workspace.h
+ opennurbs_x.h
+ opennurbs_xform.h
+ opennurbs_zlib.h
+ )
+SET(ON_DLL_HEADERS
+ opennurbs_dll_resource.h
+)
+
set(OPENNURBS_LINKLIBRARIES
${BRLCAD_ZLIB_LIBRARY}
)
@@ -128,6 +234,7 @@
-DON_COMPILING_OPENNURBS
-DON_DLL_EXPORTS
)
+ SET(OPENNURBS_HEADERS "${OPENNURBS_HEADERS};${ON_DLL_HEADERS}")
else (MSVC)
add_definitions(
-DON_COMPILING_OPENNURBS
Modified: brlcad/branches/cmake/src/other/step/data/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/step/data/CMakeLists.txt 2010-09-10
21:31:53 UTC (rev 40536)
+++ brlcad/branches/cmake/src/other/step/data/CMakeLists.txt 2010-09-10
21:52:01 UTC (rev 40537)
@@ -21,6 +21,13 @@
)
INSTALL(FILES ${ap227_data} DESTINATION ${SCL_DATA}/data/ap227)
+SET(step_example_data
+ example/example.exp
+)
+INSTALL(FILES ${step_example_data} DESTINATION ${SCL_DATA}/data/example)
+
+
+
SET(step_datafiles
pdmnet.exp
select.exp
Modified: brlcad/branches/cmake/src/vfont/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/vfont/CMakeLists.txt 2010-09-10 21:31:53 UTC
(rev 40536)
+++ brlcad/branches/cmake/src/vfont/CMakeLists.txt 2010-09-10 21:52:01 UTC
(rev 40537)
@@ -11,5 +11,5 @@
add_library(vfont getfont.c)
target_link_libraries(vfont bu)
-#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fix.6r DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/vfont)
-#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/nonie.r.12 DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/vfont)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fix.6r DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/vfont)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/nonie.r.12 DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/vfont)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
