Revision: 40483
http://brlcad.svn.sourceforge.net/brlcad/?rev=40483&view=rev
Author: starseeker
Date: 2010-09-06 05:15:35 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
Add some missing conv programs, fix opennurbs include dir to match autotools
result, other misc. fixes.
Modified Paths:
--------------
brlcad/branches/cmake/src/conv/CMakeLists.txt
brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
brlcad/branches/cmake/src/rt/CMakeLists.txt
brlcad/branches/cmake/src/rttherm/CMakeLists.txt
Modified: brlcad/branches/cmake/src/conv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/CMakeLists.txt 2010-09-06 03:25:33 UTC
(rev 40482)
+++ brlcad/branches/cmake/src/conv/CMakeLists.txt 2010-09-06 05:15:35 UTC
(rev 40483)
@@ -29,10 +29,20 @@
BRLCAD_ADDEXEC(asc2g asc/asc2g.c "bu librt wdb ged")
+BRLCAD_ADDEXEC(asc2pix asc/asc2pix.c bu)
+
+BRLCAD_ADDEXEC(pix2asc asc/pix2asc.c bu)
+
+BRLCAD_ADDEXEC(asc-nmg nmg/asc-nmg.c wdb)
+
BRLCAD_ADDEXEC(g2asc asc/g2asc.c "bu librt")
BRLCAD_ADDEXEC(bot-bldxf dxf/bot-bldxf.c "bu librt")
+BRLCAD_ADDEXEC(bot_dump bot_dump.c "librt ged")
+
+BRLCAD_ADDEXEC(bot_shell-vtk bot_shell-vtk.c librt)
+
SET(comgeom-g_SRCS
comgeom/cvt.c
comgeom/f2a.c
@@ -44,12 +54,36 @@
)
BRLCAD_ADDEXEC(comgeom-g "${comgeom-g_SRCS}" "bu bn wdb")
+BRLCAD_ADDEXEC(conv-vg2g conv-vg2g.c "bu sysv")
+
+BRLCAD_ADDEXEC(cy-g cy-g.c wdb)
+
BRLCAD_ADDEXEC(dbupgrade dbupgrade.c "bu librt wdb")
+BRLCAD_ADDEXEC(dem-g dem-g.c wdb)
+
BRLCAD_ADDEXEC(dxf-g dxf/dxf-g.c "bu bn librt wdb")
+BRLCAD_ADDEXEC(enf-g enf-g.c wdb)
+
+BRLCAD_ADDEXEC(euclid_format euclid/euclid_format.c librt)
+
+BRLCAD_ADDEXEC(euclid_unformat euclid/euclid_unformat.c "bu bn sysv")
+
+BRLCAD_ADDEXEC(euclid-g euclid/euclid-g.c wdb)
+
BRLCAD_ADDEXEC(g-dxf dxf/g-dxf.c "bu librt gcv")
+BRLCAD_ADDEXEC(g-egg g-egg.c "wdb gcv")
+
+BRLCAD_ADDEXEC(g-euclid euclid/g-euclid.c librt)
+
+BRLCAD_ADDEXEC(g-euclid1 euclid/g-euclid1.c librt)
+
+BRLCAD_ADDEXEC(g-nff g-nff.c wdb)
+
+BRLCAD_ADDEXEC(g-nmg nmg/g-nmg.c wdb)
+
BRLCAD_ADDEXEC(fast4-g fast4-g.c "bu librt wdb")
BRLCAD_ADDEXEC(jack-g jack/jack-g.c "bu librt wdb")
@@ -90,8 +124,16 @@
BRLCAD_ADDEXEC(nastran-g nastran-g.c "bu librt wdb")
+BRLCAD_ADDEXEC(nmg-bot nmg/nmg-bot.c wdb)
+
+BRLCAD_ADDEXEC(nmg-rib nmg/nmg-rib.c wdb)
+
+BRLCAD_ADDEXEC(nmg-sgp nmg/nmg-sgp.c wdb)
+
BRLCAD_ADDEXEC(ply-g ply-g.c "bu librt")
+BRLCAD_ADDEXEC(poly-bot poly-bot.c wdb)
+
BRLCAD_ADDEXEC(proe-g proe-g.c "bu librt wdb")
BRLCAD_ADDEXEC(viewpoint-g viewpoint-g.c "bu librt wdb")
Modified: brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2010-09-06
03:25:33 UTC (rev 40482)
+++ brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2010-09-06
05:15:35 UTC (rev 40483)
@@ -151,4 +151,4 @@
LIBRARY DESTINATION lib
)
-install(FILES ${OPENNURBS_HEADERS} DESTINATION include)
+install(FILES ${OPENNURBS_HEADERS} DESTINATION include/openNURBS)
Modified: brlcad/branches/cmake/src/rt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/rt/CMakeLists.txt 2010-09-06 03:25:33 UTC (rev
40482)
+++ brlcad/branches/cmake/src/rt/CMakeLists.txt 2010-09-06 05:15:35 UTC (rev
40483)
@@ -137,7 +137,8 @@
-DBRLCADBUILD=1
)
-BRLCAD_ADDEXEC(rtexample "${rtexample_SRCS}" "fb librt optical")
+add_executable(rtexample "${rtexample_SRCS}")
+target_link_libraries(rtexample fb librt optical)
BRLCAD_ADDEXEC(reshoot "${reshoot_SRCS}" "${CMAKE_THREAD_LIBS_INIT} fb librt
optical")
Modified: brlcad/branches/cmake/src/rttherm/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/rttherm/CMakeLists.txt 2010-09-06 03:25:33 UTC
(rev 40482)
+++ brlcad/branches/cmake/src/rttherm/CMakeLists.txt 2010-09-06 05:15:35 UTC
(rev 40483)
@@ -18,8 +18,10 @@
add_executable(rttherm spectrum.c viewtherm.c)
TARGET_LINK_LIBRARIES(rttherm librttherm optical fb multispectral ged)
SET_TARGET_PROPERTIES(rttherm PROPERTIES COMPILE_DEFINITIONS
"RT_MULTISPECTRAL")
+INSTALL(PROGRAMS ${BRLCAD_BINARY_DIR}/bin/rttherm DESTINATION
+ ${BRLCAD_INSTALL_BIN_DIR})
-BRLCAD_ADDEXEC(ssamp_bw ssamp-bw.c "optical")
+BRLCAD_ADDEXEC(ssamp-bw ssamp-bw.c "optical")
set(rttherm_MANS
rttherm.1
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
