Revision: 40451
http://brlcad.svn.sourceforge.net/brlcad/?rev=40451&view=rev
Author: starseeker
Date: 2010-09-03 18:57:29 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
Now that we have (in principle anyway) the necessary libraries, start adding in
src/conv
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/conv/CMakeLists.txt
brlcad/branches/cmake/src/rt/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-03 17:58:15 UTC (rev
40450)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-03 18:57:29 UTC (rev
40451)
@@ -1083,6 +1083,7 @@
ADD_SUBDIRECTORY(src/libged)
ADD_SUBDIRECTORY(src/liboptical)
ADD_SUBDIRECTORY(src/liborle)
+ADD_SUBDIRECTORY(src/conv)
ADD_SUBDIRECTORY(src/rt)
# Now that everything is configured, print a summary of the build settings.
This is a bit complicated, but
Modified: brlcad/branches/cmake/src/conv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/CMakeLists.txt 2010-09-03 17:58:15 UTC
(rev 40450)
+++ brlcad/branches/cmake/src/conv/CMakeLists.txt 2010-09-03 18:57:29 UTC
(rev 40451)
@@ -1,42 +1,46 @@
+#ADD_SUBDIRECTORY(step)
+#ADD_SUBDIRECTORY(iges)
+#ADD_SUBDIRECTORY(intaval)
+
include_directories(
- ../../include
- ../other/libz
- ../other/openNURBS
- ../other/libregex
- ../other/tcl/generic
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BRLCAD_ZLIB_INCLUDE_DIR}
+ ${BRLCAD_REGEX_INCLUDE_DIR}
+ ${BRLCAD_OPENNURBS_INCLUDE_DIR}
+ ${TCL_INCLUDE_PATH}
)
+IF(MSVC)
add_definitions(
- -DBRLCAD_DLL
-DHAVE_CONFIG_H
-DBRLCADBUILD
-DON_DLL_IMPORTS
)
-
-add_executable(3dm-g
- 3dm/3dm-g.cpp
+ELSE(MSVC)
+add_definitions(
+ -DHAVE_CONFIG_H
+ -DBRLCADBUILD
)
-target_link_libraries(3dm-g
- BrlcadCore
- openNURBS
-)
+ENDIF(MSVC)
-add_executable(asc2g
- asc/asc2g.c
-)
-target_link_libraries(asc2g
- BrlcadCore
- tcl85
-)
+add_executable(3dm-g 3dm/3dm-g.cpp)
+set_target_properties(3dm-g PROPERTIES COMPILE_DEFINITIONS "OBJ_BREP=1")
+target_link_libraries(3dm-g wdb ${BRLCAD_OPENNURBS_LIBRARY})
+INSTALL(TARGETS 3dm-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g2asc
- asc/g2asc.c
-)
-target_link_libraries(g2asc
- BrlcadCore
- tcl85
-)
+add_executable(asc2g asc/asc2g.c)
+target_link_libraries(asc2g bu librt wdb ged)
+INSTALL(TARGETS asc2g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+add_executable(g2asc asc/g2asc.c)
+target_link_libraries(g2asc bu librt)
+INSTALL(TARGETS g2asc RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
+add_executable(bot-bldxf dxf/bot-bldxf.c)
+target_link_libraries(bot-bldxf bu librt)
+INSTALL(TARGETS bot-bldxf RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(comgeom-g
comgeom/cvt.c
comgeom/f2a.c
@@ -46,202 +50,113 @@
comgeom/solid.c
comgeom/tools.c
)
-target_link_libraries(comgeom-g
- BrlcadCore
-)
+target_link_libraries(comgeom-g bu bn wdb)
+INSTALL(TARGETS comgeom-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(bot-bldxf
- dxf/bot-bldxf.c
-)
-target_link_libraries(bot-bldxf
- BrlcadCore
-)
+add_executable(dbupgrade dbupgrade.c)
+target_link_libraries(dbupgrade bu librt wdb)
+INSTALL(TARGETS dbupgrade RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(dxf-g
- dxf/dxf-g.c
-)
-target_link_libraries(dxf-g
- BrlcadCore
-)
+add_executable(dxf-g dxf/dxf-g.c)
+target_link_libraries(dxf-g bu bn librt wdb)
+INSTALL(TARGETS dxf-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g-dxf
- dxf/g-dxf.c
-)
-target_link_libraries(g-dxf
- BrlcadCore
-)
+add_executable(g-dxf dxf/g-dxf.c)
+target_link_libraries(g-dxf bu librt gcv)
+INSTALL(TARGETS g-dxf RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(fast4-g
- fast4-g.c
-)
-target_link_libraries(fast4-g
- BrlcadCore
-)
+add_executable(fast4-g fast4-g.c)
+target_link_libraries(fast4-g bu librt wdb)
+INSTALL(TARGETS fast4-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(jack-g
- jack/jack-g.c
-)
-target_link_libraries(jack-g
- BrlcadCore
-)
+add_executable(jack-g jack/jack-g.c)
+target_link_libraries(jack-g bu librt wdb)
+INSTALL(TARGETS jack-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g-jack
- jack/g-jack.c
-)
-target_link_libraries(g-jack
- BrlcadCore
-)
+add_executable(g-jack jack/g-jack.c)
+target_link_libraries(g-jack bu librt)
+INSTALL(TARGETS g-jack RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g-off
- off/g-off.c
-)
-target_link_libraries(g-off
- BrlcadCore
-)
+add_executable(g-off off/g-off.c)
+target_link_libraries(g-off bu librt)
+INSTALL(TARGETS g-off RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(off-g
- off/off-g.c
-)
-target_link_libraries(off-g
- BrlcadCore
-)
+add_executable(off-g off/off-g.c)
+target_link_libraries(off-g bu librt wdb)
+INSTALL(TARGETS off-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(stl-g
- stl/stl-g.c
-)
-target_link_libraries(stl-g
- BrlcadCore
-)
+add_executable(stl-g stl/stl-g.c)
+target_link_libraries(stl-g bu librt wdb)
+INSTALL(TARGETS stl-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g-stl
- stl/g-stl.c
-)
-target_link_libraries(g-stl
- BrlcadCore
-)
+add_executable(g-stl stl/g-stl.c)
+target_link_libraries(g-stl bu librt gcv)
+INSTALL(TARGETS g-stl RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(dbupgrade
- dbupgrade.c
-)
-target_link_libraries(dbupgrade
- BrlcadCore
-)
+add_executable(g4-g5 g4-g5.c)
+target_link_libraries(g4-g5 bu librt)
+INSTALL(TARGETS g4-g5 RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g4-g5
- g4-g5.c
-)
-target_link_libraries(g4-g5
- BrlcadCore
-)
+add_executable(g5-g4 g5-g4.c)
+target_link_libraries(g5-g4 bu librt wdb)
+INSTALL(TARGETS g5-g4 RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g5-g4
- g5-g4.c
-)
-target_link_libraries(g5-g4
- BrlcadCore
-)
+add_executable(g-acad g-acad.c)
+target_link_libraries(g-acad bu librt)
+INSTALL(TARGETS g-acad RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g-acad
- g-acad.c
-)
-target_link_libraries(g-acad
- BrlcadCore
-)
+add_executable(g-obj g-obj.c)
+target_link_libraries(g-obj bu librt)
+INSTALL(TARGETS g-obj RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g-obj
- g-obj.c
-)
-target_link_libraries(g-obj
- BrlcadCore
-)
+add_executable(obj-g obj-g.c)
+target_link_libraries(obj-g bu librt)
+INSTALL(TARGETS obj-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(obj-g
- obj-g.c
-)
-target_link_libraries(obj-g
- BrlcadCore
-)
+add_executable(patch-g patch/patch-g.c)
+target_link_libraries(patch-g bu librt wdb)
+INSTALL(TARGETS patch-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(patch-g
- patch/patch-g.c
-)
-target_link_libraries(patch-g
- BrlcadCore
-)
+add_executable(rpatch patch/rpatch.c)
+target_link_libraries(rpatch bu librt)
+INSTALL(TARGETS rpatch RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(rpatch
- patch/rpatch.c
-)
-target_link_libraries(rpatch
- BrlcadCore
-)
+add_executable(g-tankill tankill/g-tankill.c)
+target_link_libraries(g-tankill bu librt)
+INSTALL(TARGETS g-tankill RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g-tankill
- tankill/g-tankill.c
-)
-target_link_libraries(g-tankill
- BrlcadCore
-)
+add_executable(tankill-g tankill/tankill-g.c)
+target_link_libraries(tankill-g bu librt wdb)
+INSTALL(TARGETS tankill-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(tankill-g
- tankill/tankill-g.c
-)
-target_link_libraries(tankill-g
- BrlcadCore
-)
+add_executable(g-var g-var.c)
+target_link_libraries(g-var bu librt)
+INSTALL(TARGETS g-var RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g-var
- g-var.c
-)
-target_link_libraries(g-var
- BrlcadCore
-)
+add_executable(g-vrml g-vrml.c)
+target_link_libraries(g-vrml bu librt)
+INSTALL(TARGETS g-vrml RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g-vrml
- g-vrml.c
-)
-target_link_libraries(g-vrml
- BrlcadCore
-)
+add_executable(g-x3d g-x3d.c)
+target_link_libraries(g-x3d bu librt)
+INSTALL(TARGETS g-x3d RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(g-x3d
- g-x3d.c
-)
-target_link_libraries(g-x3d
- BrlcadCore
-)
+add_executable(nastran-g nastran-g.c)
+target_link_libraries(nastran-g bu librt wdb)
+INSTALL(TARGETS nastran-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(nastran-g
- nastran-g.c
-)
-target_link_libraries(nastran-g
- BrlcadCore
-)
+add_executable(ply-g ply-g.c)
+target_link_libraries(ply-g bu librt)
+INSTALL(TARGETS ply-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(ply-g
- ply-g.c
-)
-target_link_libraries(ply-g
- BrlcadCore
-)
+add_executable(proe-g proe-g.c)
+target_link_libraries(proe-g bu librt wdb)
+INSTALL(TARGETS proe-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(proe-g
- proe-g.c
-)
-target_link_libraries(proe-g
- BrlcadCore
-)
+add_executable(viewpoint-g viewpoint-g.c)
+target_link_libraries(viewpoint-g bu librt wdb)
+INSTALL(TARGETS viewpoint-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
-add_executable(viewpoint-g
- viewpoint-g.c
-)
-target_link_libraries(viewpoint-g
- BrlcadCore
-)
-
-add_executable(g-xxx_facets
- g-xxx_facets.c
-)
-target_link_libraries(g-xxx_facets
- BrlcadCore
-)
+add_executable(g-xxx_facets g-xxx_facets.c)
+target_link_libraries(g-xxx_facets bu librt)
+INSTALL(TARGETS g-xxx_facets RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
Modified: brlcad/branches/cmake/src/rt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/rt/CMakeLists.txt 2010-09-03 17:58:15 UTC (rev
40450)
+++ brlcad/branches/cmake/src/rt/CMakeLists.txt 2010-09-03 18:57:29 UTC (rev
40451)
@@ -143,53 +143,94 @@
add_executable(reshoot ${reshoot_SRCS})
target_link_libraries(reshoot ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS reshoot RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
add_executable(rtwalk ${rtwalk_SRCS})
target_link_libraries(rtwalk ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtwalk RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
add_executable(rtshot ${rtshot_SRCS})
target_link_libraries(rtshot ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtshot RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
add_executable(hurt ${hurt_SRCS})
target_link_libraries(hurt ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS hurt RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
add_executable(rtmlt ${rtmlt_SRCS})
target_link_libraries(rtmlt ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtmlt RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtregis ${rtregis_SRCS})
target_link_libraries(rtregis ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtregis RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtscale ${rtscale_SRCS})
target_link_libraries(rtscale ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtscale RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rt ${rt_SRCS})
target_link_libraries(rt ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rt RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rt_bot_faces ${rt_bot_faces_SRCS})
target_link_libraries(rt_bot_faces ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rt_bot_faces RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtarea ${rtarea_SRCS})
target_link_libraries(rtarea ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtarea RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtcell ${rtcell_SRCS})
target_link_libraries(rtcell ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtcell RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtcheck ${rtcheck_SRCS})
target_link_libraries(rtcheck ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtcheck RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtedge ${rtedge_SRCS})
target_link_libraries(rtedge ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtedge RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtfrac ${rtfrac_SRCS})
target_link_libraries(rtfrac ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtfrac RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtg3 ${rtg3_SRCS})
target_link_libraries(rtg3 ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtg3 RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rthide ${rthide_SRCS})
target_link_libraries(rthide ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rthide RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtpp ${rtpp_SRCS})
target_link_libraries(rtpp ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtpp RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtrad ${rtrad_SRCS})
target_link_libraries(rtrad ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtrad RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtrange ${rtrange_SRCS})
target_link_libraries(rtrange ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtrange RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtray ${rtray_SRCS})
target_link_libraries(rtray ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtray RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtsil ${rtsil_SRCS})
target_link_libraries(rtsil ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtsil RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtweight ${rtweight_SRCS})
target_link_libraries(rtweight ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtweight RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
add_executable(rtxray ${rtxray_SRCS})
target_link_libraries(rtxray ${CMAKE_THREAD_LIBS_INIT} fb librt optical)
+INSTALL(TARGETS rtxray RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
add_library(remrt STATIC ${LIBREMRT_SOURCES})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
