Revision: 41042
http://brlcad.svn.sourceforge.net/brlcad/?rev=41042&view=rev
Author: starseeker
Date: 2010-10-18 16:39:53 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Fix some more ordering issues.
Modified Paths:
--------------
brlcad/branches/cmake/src/conv/CMakeLists.txt
brlcad/branches/cmake/src/conv/iges/CMakeLists.txt
brlcad/branches/cmake/src/conv/intaval/CMakeLists.txt
brlcad/branches/cmake/src/conv/step/CMakeLists.txt
brlcad/branches/cmake/src/libged/CMakeLists.txt
Modified: brlcad/branches/cmake/src/conv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/CMakeLists.txt 2010-10-18 16:28:40 UTC
(rev 41041)
+++ brlcad/branches/cmake/src/conv/CMakeLists.txt 2010-10-18 16:39:53 UTC
(rev 41042)
@@ -21,7 +21,7 @@
BRLCAD_ADDEXEC(3dm-g 3dm/3dm-g.cpp "libwdb ${OPENNURBS_LIBRARY}")
set_target_properties(3dm-g PROPERTIES COMPILE_DEFINITIONS "OBJ_BREP=1")
-BRLCAD_ADDEXEC(asc2g asc/asc2g.c "libged librt libwdb libbu")
+BRLCAD_ADDEXEC(asc2g asc/asc2g.c "libged libwdb librt libbu")
BRLCAD_ADDEXEC(asc2pix asc/asc2pix.c libbu)
@@ -48,21 +48,21 @@
)
BRLCAD_ADDEXEC(comgeom-g "${comgeom-g_SRCS}" "libwdb libbn libbu")
-BRLCAD_ADDEXEC(conv-vg2g conv-vg2g.c "libsysv libbu")
+BRLCAD_ADDEXEC(conv-vg2g conv-vg2g.c "libbu libsysv")
BRLCAD_ADDEXEC(cy-g cy-g.c libwdb)
-BRLCAD_ADDEXEC(dbupgrade dbupgrade.c "librt libwdb libbu")
+BRLCAD_ADDEXEC(dbupgrade dbupgrade.c "libwdb librt libbu")
BRLCAD_ADDEXEC(dem-g dem-g.c libwdb)
-BRLCAD_ADDEXEC(dxf-g dxf/dxf-g.c "librt libwdb libbn libbu")
+BRLCAD_ADDEXEC(dxf-g dxf/dxf-g.c "libwdb librt libbn libbu")
BRLCAD_ADDEXEC(enf-g enf-g.c libwdb)
BRLCAD_ADDEXEC(euclid_format euclid/euclid_format.c librt)
-BRLCAD_ADDEXEC(euclid_unformat euclid/euclid_unformat.c "libbn libsysv libbu")
+BRLCAD_ADDEXEC(euclid_unformat euclid/euclid_unformat.c "libbn libbu libsysv")
BRLCAD_ADDEXEC(euclid-g euclid/euclid-g.c libwdb)
@@ -78,17 +78,17 @@
BRLCAD_ADDEXEC(g-nmg nmg/g-nmg.c libwdb)
-BRLCAD_ADDEXEC(fast4-g fast4-g.c "librt libwdb libbu")
+BRLCAD_ADDEXEC(fast4-g fast4-g.c "libwdb librt libbu")
-BRLCAD_ADDEXEC(jack-g jack/jack-g.c "librt libwdb libbu")
+BRLCAD_ADDEXEC(jack-g jack/jack-g.c "libwdb librt libbu")
BRLCAD_ADDEXEC(g-jack jack/g-jack.c "librt libbu")
BRLCAD_ADDEXEC(g-off off/g-off.c "librt libbu")
-BRLCAD_ADDEXEC(off-g off/off-g.c "librt libwdb libbu")
+BRLCAD_ADDEXEC(off-g off/off-g.c "libwdb librt libbu")
-BRLCAD_ADDEXEC(stl-g stl/stl-g.c "librt libwdb libbu")
+BRLCAD_ADDEXEC(stl-g stl/stl-g.c "libwdb librt libbu")
BRLCAD_ADDEXEC(g-stl stl/g-stl.c "librt libgcv libbu")
@@ -96,7 +96,7 @@
target_link_libraries(g4-g5 librt libbu)
add_executable(g5-g4 g5-g4.c)
-target_link_libraries(g5-g4 librt libwdb libbu)
+target_link_libraries(g5-g4 libwdb librt libbu)
BRLCAD_ADDEXEC(g-acad g-acad.c "librt libbu")
@@ -104,13 +104,13 @@
BRLCAD_ADDEXEC(obj-g obj-g.c "librt libbu")
-BRLCAD_ADDEXEC(patch-g patch/patch-g.c "librt libwdb libbu")
+BRLCAD_ADDEXEC(patch-g patch/patch-g.c "libwdb librt libbu")
BRLCAD_ADDEXEC(rpatch patch/rpatch.c "librt libbu")
BRLCAD_ADDEXEC(g-tankill tankill/g-tankill.c "librt libbu")
-BRLCAD_ADDEXEC(tankill-g tankill/tankill-g.c "librt libwdb libbu")
+BRLCAD_ADDEXEC(tankill-g tankill/tankill-g.c "libwdb librt libbu")
BRLCAD_ADDEXEC(g-var g-var.c "librt libbu")
@@ -118,7 +118,7 @@
BRLCAD_ADDEXEC(g-x3d g-x3d.c "librt libbu")
-BRLCAD_ADDEXEC(nastran-g nastran-g.c "librt libwdb libbu")
+BRLCAD_ADDEXEC(nastran-g nastran-g.c "libwdb librt libbu")
BRLCAD_ADDEXEC(nmg-bot nmg/nmg-bot.c libwdb)
@@ -130,14 +130,14 @@
BRLCAD_ADDEXEC(poly-bot poly-bot.c libwdb)
-BRLCAD_ADDEXEC(proe-g proe-g.c "librt libwdb libbu")
+BRLCAD_ADDEXEC(proe-g proe-g.c "libwdb librt libbu")
-BRLCAD_ADDEXEC(viewpoint-g viewpoint-g.c "librt libwdb libbu")
+BRLCAD_ADDEXEC(viewpoint-g viewpoint-g.c "libwdb librt libbu")
add_executable(g-xxx_facets g-xxx_facets.c)
target_link_libraries(g-xxx_facets librt libbu)
-BRLCAD_ADDEXEC(g-shell.rect g-shell.rect.c "librt libwdb libbu")
+BRLCAD_ADDEXEC(g-shell.rect g-shell.rect.c "libwdb librt libbu")
install(PROGRAMS intaval-g.py DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
Modified: brlcad/branches/cmake/src/conv/iges/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/iges/CMakeLists.txt 2010-10-18 16:28:40 UTC
(rev 41041)
+++ brlcad/branches/cmake/src/conv/iges/CMakeLists.txt 2010-10-18 16:39:53 UTC
(rev 41042)
@@ -17,7 +17,7 @@
n_iges.cpp
n_main.cpp
)
-target_link_libraries(iges librt libwdb libbu ${OPENNURBS_LIBRARY})
+target_link_libraries(iges libwdb librt libbu ${OPENNURBS_LIBRARY})
#INSTALL(TARGETS iges RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
add_executable(iges-g
@@ -93,7 +93,7 @@
usage.c
wedge.c
)
-target_link_libraries(iges-g librt libwdb libbn libbu)
+target_link_libraries(iges-g libwdb librt libbn libbu)
INSTALL(TARGETS iges-g RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
add_executable(g-iges
Modified: brlcad/branches/cmake/src/conv/intaval/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/intaval/CMakeLists.txt 2010-10-18
16:28:40 UTC (rev 41041)
+++ brlcad/branches/cmake/src/conv/intaval/CMakeLists.txt 2010-10-18
16:39:53 UTC (rev 41042)
@@ -17,5 +17,5 @@
tgf-g.cpp
write_brl.cpp
)
-target_link_libraries(tgf-g librt libwdb libbu)
+target_link_libraries(tgf-g libwdb librt libbu)
INSTALL(TARGETS tgf-g RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
Modified: brlcad/branches/cmake/src/conv/step/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/step/CMakeLists.txt 2010-10-18 16:28:40 UTC
(rev 41041)
+++ brlcad/branches/cmake/src/conv/step/CMakeLists.txt 2010-10-18 16:39:53 UTC
(rev 41042)
@@ -387,5 +387,5 @@
)
add_executable(step-g ${stepg_SOURCES})
-target_link_libraries(step-g librt libwdb steputils stepcore stepdai
stepeditor libbu ${OPENNURBS_LIBRARY})
+target_link_libraries(step-g libwdb librt libbu steputils stepcore stepdai
stepeditor ${OPENNURBS_LIBRARY})
INSTALL(TARGETS step-g RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
Modified: brlcad/branches/cmake/src/libged/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libged/CMakeLists.txt 2010-10-18 16:28:40 UTC
(rev 41041)
+++ brlcad/branches/cmake/src/libged/CMakeLists.txt 2010-10-18 16:39:53 UTC
(rev 41042)
@@ -265,5 +265,5 @@
${TCL_INCLUDE_PATH}
)
-BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}" "librt libwdb libanalyze libbu
${REGEX_LIBRARY}")
+BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}" "libwdb librt libbu libanalyze
${REGEX_LIBRARY}")
SET_TARGET_PROPERTIES(libged PROPERTIES VERSION 19.0.1 SOVERSION 19)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
