Revision: 40531
http://brlcad.svn.sourceforge.net/brlcad/?rev=40531&view=rev
Author: starseeker
Date: 2010-09-10 20:13:25 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
Don't install some things not being installed by autotools, add step man pages.
Modified Paths:
--------------
brlcad/branches/cmake/src/conv/CMakeLists.txt
brlcad/branches/cmake/src/conv/iges/CMakeLists.txt
brlcad/branches/cmake/src/gtools/CMakeLists.txt
brlcad/branches/cmake/src/mged/points/CMakeLists.txt
brlcad/branches/cmake/src/other/step/CMakeLists.txt
brlcad/branches/cmake/src/rt/CMakeLists.txt
brlcad/branches/cmake/src/vfont/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/cmake/src/other/step/doc/CMakeLists.txt
Modified: brlcad/branches/cmake/src/conv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/CMakeLists.txt 2010-09-10 18:42:49 UTC
(rev 40530)
+++ brlcad/branches/cmake/src/conv/CMakeLists.txt 2010-09-10 20:13:25 UTC
(rev 40531)
@@ -98,9 +98,11 @@
BRLCAD_ADDEXEC(g-stl stl/g-stl.c "bu librt gcv")
-BRLCAD_ADDEXEC(g4-g5 g4-g5.c "bu librt")
+add_executable(g4-g5 g4-g5.c)
+target_link_libraries(g4-g5 bu librt)
-BRLCAD_ADDEXEC(g5-g4 g5-g4.c "bu librt wdb")
+add_executable(g5-g4 g5-g4.c)
+target_link_libraries(g5-g4 bu librt wdb)
BRLCAD_ADDEXEC(g-acad g-acad.c "bu librt")
@@ -138,7 +140,8 @@
BRLCAD_ADDEXEC(viewpoint-g viewpoint-g.c "bu librt wdb")
-BRLCAD_ADDEXEC(g-xxx_facets g-xxx_facets.c "bu librt")
+add_executable(g-xxx_facets g-xxx_facets.c)
+target_link_libraries(g-xxx_facets bu librt)
BRLCAD_ADDEXEC(g-shell.rect g-shell.rect.c "bu librt wdb")
Modified: brlcad/branches/cmake/src/conv/iges/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/iges/CMakeLists.txt 2010-09-10 18:42:49 UTC
(rev 40530)
+++ brlcad/branches/cmake/src/conv/iges/CMakeLists.txt 2010-09-10 20:13:25 UTC
(rev 40531)
@@ -27,7 +27,7 @@
n_main.cpp
)
target_link_libraries(iges bu librt wdb ${BRLCAD_OPENNURBS_LIBRARY})
-INSTALL(TARGETS iges RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+#INSTALL(TARGETS iges RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
add_executable(iges-g
add_face.c
Modified: brlcad/branches/cmake/src/gtools/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/gtools/CMakeLists.txt 2010-09-10 18:42:49 UTC
(rev 40530)
+++ brlcad/branches/cmake/src/gtools/CMakeLists.txt 2010-09-10 20:13:25 UTC
(rev 40531)
@@ -14,7 +14,9 @@
beset/population.c
)
-BRLCAD_ADDEXEC(beset "${beset_SRCS}" wdb)
+add_executable(beset ${beset_SRCS})
+target_link_libraries(beset wdb)
+
BRLCAD_ADDEXEC(g_diff g_diff.c "librt ged tclcad")
BRLCAD_ADDEXEC(g_lint g_lint.c librt)
BRLCAD_ADDEXEC(g_qa g_qa.c "librt ged")
Modified: brlcad/branches/cmake/src/mged/points/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/mged/points/CMakeLists.txt 2010-09-10
18:42:49 UTC (rev 40530)
+++ brlcad/branches/cmake/src/mged/points/CMakeLists.txt 2010-09-10
20:13:25 UTC (rev 40531)
@@ -21,5 +21,6 @@
main.c
)
-BRLCAD_ADDLIB(points "${MGED_POINTS_SRCS}" bu)
+add_library(points ${MGED_POINTS_SRCS})
+target_link_libraries(points bu)
SET_TARGET_PROPERTIES(points PROPERTIES COMPILE_DEFINITIONS "ENABLE_POINTS")
Modified: brlcad/branches/cmake/src/other/step/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/step/CMakeLists.txt 2010-09-10 18:42:49 UTC
(rev 40530)
+++ brlcad/branches/cmake/src/other/step/CMakeLists.txt 2010-09-10 20:13:25 UTC
(rev 40531)
@@ -169,3 +169,4 @@
ADD_SUBDIRECTORY(src/clutils)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(data)
+ADD_SUBDIRECTORY(doc)
Added: brlcad/branches/cmake/src/other/step/doc/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/step/doc/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/other/step/doc/CMakeLists.txt 2010-09-10
20:13:25 UTC (rev 40531)
@@ -0,0 +1,7 @@
+SET(scl_MANS
+ man/man1/dataprobe.1
+ man/man1/fedex.1
+ man/man1/fedex_plus.1
+ man/man1/mkProbe.1
+)
+INSTALL(FILES ${scl_MANS} DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man1)
Property changes on: brlcad/branches/cmake/src/other/step/doc/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: brlcad/branches/cmake/src/rt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/rt/CMakeLists.txt 2010-09-10 18:42:49 UTC (rev
40530)
+++ brlcad/branches/cmake/src/rt/CMakeLists.txt 2010-09-10 20:13:25 UTC (rev
40531)
@@ -141,14 +141,16 @@
add_executable(rtexample "${rtexample_SRCS}")
target_link_libraries(rtexample fb librt optical)
+add_executable(hurt "${hurt_SRCS}")
+target_link_libraries(hurt fb librt optical)
+
+
BRLCAD_ADDEXEC(reshoot "${reshoot_SRCS}" "${CMAKE_THREAD_LIBS_INIT} fb librt
optical")
BRLCAD_ADDEXEC(rtwalk "${rtwalk_SRCS}" "${CMAKE_THREAD_LIBS_INIT} fb librt
optical")
BRLCAD_ADDEXEC(rtshot "${rtshot_SRCS}" "${CMAKE_THREAD_LIBS_INIT} fb librt
optical")
-BRLCAD_ADDEXEC(hurt "${hurt_SRCS}" "${CMAKE_THREAD_LIBS_INIT} fb librt
optical")
-
BRLCAD_ADDEXEC(rtmlt "${rtmlt_SRCS}" "${CMAKE_THREAD_LIBS_INIT} fb librt
optical")
BRLCAD_ADDEXEC(rtregis "${rtregis_SRCS}" "${CMAKE_THREAD_LIBS_INIT} fb librt
optical")
@@ -188,10 +190,8 @@
BRLCAD_ADDEXEC(rtxray "${rtxray_SRCS}" "${CMAKE_THREAD_LIBS_INIT} fb librt
optical")
add_library(libremrt STATIC ${LIBREMRT_SOURCES})
-INSTALL(TARGETS libremrt ARCHIVE DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
add_library(librttherm STATIC ${RT_COMMON_SRCS})
-INSTALL(TARGETS librttherm ARCHIVE DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
SET_TARGET_PROPERTIES(librttherm PROPERTIES LINKER_LANGUAGE C)
SET(rt_MANS
Modified: brlcad/branches/cmake/src/vfont/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/vfont/CMakeLists.txt 2010-09-10 18:42:49 UTC
(rev 40530)
+++ brlcad/branches/cmake/src/vfont/CMakeLists.txt 2010-09-10 20:13:25 UTC
(rev 40531)
@@ -8,7 +8,8 @@
${BRLCAD_STD_DEFS}
)
-BRLCAD_ADDLIB(vfont getfont.c bu)
+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
