Revision: 40474
http://brlcad.svn.sourceforge.net/brlcad/?rev=40474&view=rev
Author: starseeker
Date: 2010-09-05 20:44:18 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
Add in some more directories, update the nirt CMakeLists.txt. For now, turn
off the CONF/DATE/etc updating in the topelevel CMakeLists.txt, as the constant
addition of make logic keeps trigging configures - need to remember to
re-enable it at the end
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/nirt/CMakeLists.txt
brlcad/branches/cmake/src/rt/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/cmake/src/proc-db/CMakeLists.txt
brlcad/branches/cmake/src/remrt/CMakeLists.txt
brlcad/branches/cmake/src/rttherm/CMakeLists.txt
brlcad/branches/cmake/src/shapes/CMakeLists.txt
brlcad/branches/cmake/src/sig/CMakeLists.txt
brlcad/branches/cmake/src/tab/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-05 16:06:55 UTC (rev
40473)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-05 20:44:18 UTC (rev
40474)
@@ -1134,6 +1134,13 @@
ADD_SUBDIRECTORY(src/irprep)
ADD_SUBDIRECTORY(src/lgt)
ADD_SUBDIRECTORY(src/mged)
+ADD_SUBDIRECTORY(src/nirt)
+ADD_SUBDIRECTORY(src/proc-db)
+ADD_SUBDIRECTORY(src/remrt)
+ADD_SUBDIRECTORY(src/rttherm)
+ADD_SUBDIRECTORY(src/shapes)
+ADD_SUBDIRECTORY(src/sig)
+ADD_SUBDIRECTORY(src/tab)
# Now that everything is configured, print a summary of the build settings.
This is a bit complicated, but
# the basic idea is to print labels, "smart" spacers around those labels to
line everything up, and the
@@ -1304,7 +1311,7 @@
ADD_DEPENDENCIES(librt timestamp ${TCL_DEP} ${TK_DEP})
# Generate the include/conf files
-
+if(0)
# HOST
configure_file(${BRLCAD_CMAKE_DIR}/test_srcs/report_hostname.c.in
${CMAKE_BINARY_DIR}/CMakeTmp/report_hostname.c)
TRY_RUN(TIME_RESULT TIME_COMPILED
@@ -1354,3 +1361,4 @@
STRING(LENGTH ${CONFIG_TIME_MSG_LABEL} CURRENTLENGTH)
ENDWHILE(${SETTINGLABELLENGTH} GREATER ${CURRENTLENGTH})
MESSAGE("${CONFIG_TIME_MSG_LABEL}..: ${CONFIG_TIME_MSG}")
+endif()
Modified: brlcad/branches/cmake/src/nirt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/nirt/CMakeLists.txt 2010-09-05 16:06:55 UTC
(rev 40473)
+++ brlcad/branches/cmake/src/nirt/CMakeLists.txt 2010-09-05 20:44:18 UTC
(rev 40474)
@@ -1,19 +1,16 @@
include_directories(
- ../../include
- ../other/libz
- ../other/openNURBS
- ../other/libregex
- ../other/tcl/generic
+ ${BRLCAD_STD_INCLUDES}
+ ${BRLCAD_ZLIB_INCLUDE_DIR}
+ ${BRLCAD_OPENNURBS_INCLUDE_DIR}
+ ${BRLCAD_REGEX_INCLUDE_DIR}
+ ${TCL_INCLUDE_PATH}
)
add_definitions(
- -DBRLCAD_DLL
- -DHAVE_CONFIG_H
- -DBRLCADBUILD
- -DON_DLL_IMPORTS
+ ${BRLCAD_STD_DEFS}
)
-add_executable(nirt
+SET(NIRT_SRCS
nirt.c
command.c
conversion.c
@@ -24,13 +21,8 @@
str_manip.c
parse_fmt.c
)
-target_link_libraries(nirt
- BrlcadCore
-)
-add_executable(showshot
- showshot.c
-)
-target_link_libraries(showshot
- BrlcadCore
-)
+BRLCAD_ADDEXEC(nirt "${NIRT_SRCS}" "fb librt")
+SET_TARGET_PROPERTIES(nirt PROPERTIES COMPILE_DEFINITIONS
"DFLT_SHELL=\"/bin/sh\"")
+
+BRLCAD_ADDEXEC(showshot showshot.c bn)
Added: brlcad/branches/cmake/src/proc-db/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/proc-db/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/proc-db/CMakeLists.txt 2010-09-05 20:44:18 UTC
(rev 40474)
@@ -0,0 +1,50 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_STD_INCLUDES}
+ ${BRLCAD_OPENNURBS_INCLUDE_DIR}
+ ${TCL_INCLUDE_PATH}
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+BRLCAD_ADDEXEC(bottest bottest.c wdb)
+BRLCAD_ADDEXEC(brep_cube brep_cube.cpp "wdb ${BRLCAD_OPENNURBS_LIBRARY}")
+set_target_properties(brep_cube PROPERTIES COMPILE_DEFINITIONS "OBJ_BREP=1")
+BRLCAD_ADDEXEC(brep_simple brep_simple.cpp "wdb ${BRLCAD_OPENNURBS_LIBRARY}")
+set_target_properties(brep_simple PROPERTIES COMPILE_DEFINITIONS "OBJ_BREP=1")
+BRLCAD_ADDEXEC(brepintersect brepintersect.cpp "wdb
${BRLCAD_OPENNURBS_LIBRARY}")
+set_target_properties(brepintersect PROPERTIES COMPILE_DEFINITIONS
"OBJ_BREP=1")
+BRLCAD_ADDEXEC(breplicator breplicator.cpp "wdb ${BRLCAD_OPENNURBS_LIBRARY}")
+set_target_properties(breplicator PROPERTIES COMPILE_DEFINITIONS "OBJ_BREP=1")
+BRLCAD_ADDEXEC(brickwall brickwall.c wdb)
+BRLCAD_ADDEXEC(clutter "clutter.c common.c" wdb)
+BRLCAD_ADDEXEC(contours contours.c wdb)
+BRLCAD_ADDEXEC(csgbrep csgbrep.cpp wdb)
+BRLCAD_ADDEXEC(globe globe.c wdb)
+BRLCAD_ADDEXEC(kurt kurt.c wdb)
+BRLCAD_ADDEXEC(lens lens.c wdb)
+BRLCAD_ADDEXEC(masonry masonry.c wdb)
+BRLCAD_ADDEXEC(metaball metaball.c wdb)
+BRLCAD_ADDEXEC(mkbuilding "mkbuilding.c makebuilding/makebuilding.c" wdb)
+BRLCAD_ADDEXEC(molecule molecule.c wdb)
+BRLCAD_ADDEXEC(nmgmodel nmgmodel.c wdb)
+BRLCAD_ADDEXEC(pipe pipe.c wdb)
+BRLCAD_ADDEXEC(pipetest pipetest.c wdb)
+BRLCAD_ADDEXEC(pix2g pix2g.c wdb)
+BRLCAD_ADDEXEC(pyramid pyramid.c wdb)
+BRLCAD_ADDEXEC(rawbot rawbot.c wdb)
+BRLCAD_ADDEXEC(room "room.c common.c" wdb)
+BRLCAD_ADDEXEC(sketch sketch.c wdb)
+BRLCAD_ADDEXEC(sphflake sphflake.c wdb)
+BRLCAD_ADDEXEC(spltest spltest.c wdb)
+BRLCAD_ADDEXEC(surfaceintersect surfaceintersect.cpp "wdb
${BRLCAD_OPENNURBS_LIBRARY}")
+set_target_properties(surfaceintersect PROPERTIES COMPILE_DEFINITIONS
"OBJ_BREP=1")
+BRLCAD_ADDEXEC(tea tea.c wdb)
+BRLCAD_ADDEXEC(tea_nmg tea_nmg.c wdb)
+BRLCAD_ADDEXEC(terrain terrain.c wdb)
+BRLCAD_ADDEXEC(torii torii.c wdb)
+BRLCAD_ADDEXEC(tube tube.c wdb)
+BRLCAD_ADDEXEC(vegetation vegetation.c wdb)
+BRLCAD_ADDEXEC(wdb_example wdb_example.c wdb)
Property changes on: brlcad/branches/cmake/src/proc-db/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/branches/cmake/src/remrt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/remrt/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/remrt/CMakeLists.txt 2010-09-05 20:44:18 UTC
(rev 40474)
@@ -0,0 +1,13 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_STD_INCLUDES}
+ ${TCL_INCLUDE_PATH}
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+BRLCAD_ADDEXEC(remrt "ihost.c remrt.c" "libremrt optical fb")
+BRLCAD_ADDEXEC(rtsrv rtsrv.c "libremrt optical pkg")
+SET_TARGET_PROPERTIES(rtsrv PROPERTIES COMPILE_DEFINITIONS "RTSRV")
Property changes on: brlcad/branches/cmake/src/remrt/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-05 16:06:55 UTC (rev
40473)
+++ brlcad/branches/cmake/src/rt/CMakeLists.txt 2010-09-05 20:44:18 UTC (rev
40474)
@@ -185,5 +185,12 @@
BRLCAD_ADDEXEC(rtxray "${rtxray_SRCS}" "${CMAKE_THREAD_LIBS_INIT} fb librt
optical")
-add_library(remrt STATIC ${LIBREMRT_SOURCES})
-INSTALL(TARGETS remrt ARCHIVE DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+add_library(libremrt STATIC ${LIBREMRT_SOURCES})
+set_target_properties(libremrt PROPERTIES PREFIX "")
+INSTALL(TARGETS libremrt ARCHIVE DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+
+add_library(librttherm STATIC ${RT_COMMON_SRCS})
+set_target_properties(librttherm PROPERTIES PREFIX "")
+INSTALL(TARGETS librttherm ARCHIVE DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+SET_TARGET_PROPERTIES(librttherm PROPERTIES LINKER_LANGUAGE C)
+
Added: brlcad/branches/cmake/src/rttherm/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/rttherm/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/rttherm/CMakeLists.txt 2010-09-05 20:44:18 UTC
(rev 40474)
@@ -0,0 +1,22 @@
+include_directories(
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${X11_INCLUDE_DIR}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+
+IF(BRLCAD-ENABLE_X11)
+ BRLCAD_ADDEXEC(ssampview "spectrum.c ssampview.c" "optical fb ${TK_LIBRARY}
${X11_LIBRARIES}")
+ENDIF(BRLCAD-ENABLE_X11)
+
+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")
+
+BRLCAD_ADDEXEC(ssamp_bw ssamp-bw.c "optical")
Property changes on: brlcad/branches/cmake/src/rttherm/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/branches/cmake/src/shapes/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/shapes/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/shapes/CMakeLists.txt 2010-09-05 20:44:18 UTC
(rev 40474)
@@ -0,0 +1,22 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_STD_INCLUDES}
+ ${TCL_INCLUDE_PATH}
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+
+BRLCAD_ADDEXEC(bolt bolt.c wdb)
+BRLCAD_ADDEXEC(coil coil.c wdb)
+BRLCAD_ADDEXEC(fence fence.c wdb)
+BRLCAD_ADDEXEC(gastank gastank.c wdb)
+BRLCAD_ADDEXEC(handle handle.c wdb)
+BRLCAD_ADDEXEC(human human.c "wdb ged")
+BRLCAD_ADDEXEC(picket_fence picket_fence.c wdb)
+BRLCAD_ADDEXEC(tire tire.c "wdb ged")
+BRLCAD_ADDEXEC(window window.c wdb)
+BRLCAD_ADDEXEC(window_frame window_frame.c wdb)
+BRLCAD_ADDEXEC(wire wire.c wdb)
Property changes on: brlcad/branches/cmake/src/shapes/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/branches/cmake/src/sig/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/sig/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/sig/CMakeLists.txt 2010-09-05 20:44:18 UTC
(rev 40474)
@@ -0,0 +1,46 @@
+include_directories(
+ ${BRLCAD_STD_INCLUDES}
+ ${TCL_INCLUDE_PATH}
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+BRLCAD_ADDEXEC(a-d a-d.c bu)
+BRLCAD_ADDEXEC(bw-d bw-d.c bu)
+BRLCAD_ADDEXEC(c-d c-d.c "bu ${M_LIBRARY}")
+BRLCAD_ADDEXEC(d-a d-a.c bu)
+BRLCAD_ADDEXEC(d-bw d-bw.c bu)
+BRLCAD_ADDEXEC(d-f d-f.c bu)
+BRLCAD_ADDEXEC(d-i d-i.c bu)
+BRLCAD_ADDEXEC(d-u d-u.c bu)
+BRLCAD_ADDEXEC(d2-c d2-c.c bu)
+BRLCAD_ADDEXEC(damdf damdf.c bu)
+BRLCAD_ADDEXEC(dauto dauto.c bu)
+BRLCAD_ADDEXEC(dauto2 dauto2.c bu)
+BRLCAD_ADDEXEC(dconv dconv.c "bu fft")
+BRLCAD_ADDEXEC(ddisp ddisp.c fb)
+BRLCAD_ADDEXEC(dfft "dfft.c interp.c butter.c" "bu fft")
+BRLCAD_ADDEXEC(dmod dmod.c bu)
+BRLCAD_ADDEXEC(dpeak dpeak.c bu)
+BRLCAD_ADDEXEC(dsel dsel.c bu)
+BRLCAD_ADDEXEC(dstats dstats.c "bu ${M_LIBRARY}")
+BRLCAD_ADDEXEC(dwin "dwin.c coswin.c hamwin.c" "bu ${M_LIBRARY}")
+BRLCAD_ADDEXEC(f-d f-d.c bu)
+BRLCAD_ADDEXEC(f-i f-i.c bu)
+BRLCAD_ADDEXEC(fhor fhor.c fb)
+BRLCAD_ADDEXEC(i-a i-a.c bu)
+BRLCAD_ADDEXEC(i-d i-d.c bu)
+BRLCAD_ADDEXEC(i-f i-f.c bu)
+BRLCAD_ADDEXEC(ihist ihist.c bu)
+BRLCAD_ADDEXEC(imod imod.c "bu ${M_LIBRARY}")
+BRLCAD_ADDEXEC(istats istats.c bu)
+BRLCAD_ADDEXEC(smod smod.c bu)
+BRLCAD_ADDEXEC(syn syn.c "bu ${M_LIBRARY}")
+BRLCAD_ADDEXEC(u-a u-a.c bu)
+BRLCAD_ADDEXEC(u-bw u-bw.c bu)
+BRLCAD_ADDEXEC(u-d u-d.c bu)
+BRLCAD_ADDEXEC(u-f u-f.c bu)
+BRLCAD_ADDEXEC(umod umod.c "bu ${M_LIBRARY}")
+BRLCAD_ADDEXEC(ustats ustats.c bu)
Property changes on: brlcad/branches/cmake/src/sig/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/branches/cmake/src/tab/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/tab/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/tab/CMakeLists.txt 2010-09-05 20:44:18 UTC
(rev 40474)
@@ -0,0 +1,13 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${BRLCAD_STD_INCLUDES}
+)
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+LEX_TARGET(SS_Scanner script.l
+ ${CMAKE_CURRENT_BINARY_DIR}/script.c COMPILE_FLAGS "-l")
+
+BRLCAD_ADDEXEC(scriptsort "scriptsort.c ${LEX_SS_Scanner_OUTPUTS}" librt)
Property changes on: brlcad/branches/cmake/src/tab/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
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
