Revision: 40463
http://brlcad.svn.sourceforge.net/brlcad/?rev=40463&view=rev
Author: starseeker
Date: 2010-09-04 17:07:11 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Add in libtermio and adrt - needed to fix the bsd library stuff for adrt.
CMake doesn't like empty add_library calls, so did tie0 as one library and made
tie1 the 'parent' library that links in tie0.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/cmake/src/adrt/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-04 16:13:40 UTC (rev
40462)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-04 17:07:11 UTC (rev
40463)
@@ -413,17 +413,15 @@
# This may be overkill - does CHECK_LIBRARY_EXISTS usably set
# anything for us? May want to wrap some combination of
# CHECK_LIBRARY_EXISTS and FIND_LIBRARY into a macro...
-set(LIBBSD "")
-CHECK_LIBRARY_EXISTS(bsd daemon "" HAVE_BSDDAEMON)
-if (NOT HAVE_BSDDAEMON)
- CHECK_LIBRARY_EXISTS(c daemon "" HAVE_CDAEMON)
-endif (NOT HAVE_BSDDAEMON)
-if (HAVE_BSDDAEMON)
- set(LIBBSD "-lbsd")
-endif (HAVE_BSDDAEMON)
-if (HAVE_CDAEMON)
- set(LIBBSD "-c")
-endif (HAVE_CDAEMON)
+SET(BSD_LIST "bsd;c")
+FOREACH(bsdcandidate ${BSD_LIST})
+ IF(NOT BSD_LIBRARY)
+ CHECK_LIBRARY_EXISTS(${bsdcandidate} daemon "" HAVE_BSDDAEMON)
+ if (HAVE_BSDDAEMON)
+ find_library(BSD_LIBRARY NAMES ${bsdcandidate})
+ endif (HAVE_BSDDAEMON)
+ ENDIF(NOT BSD_LIBRARY)
+ENDFOREACH(bsdcandidate ${BSD_LIST})
# rework this - check maybe should come after library
# is successfully found? Also, need to make sure
@@ -1104,6 +1102,8 @@
ADD_SUBDIRECTORY(src/libicv)
ADD_SUBDIRECTORY(src/libmultispectral)
ADD_SUBDIRECTORY(src/libtclcad)
+ADD_SUBDIRECTORY(src/libtermio)
+ADD_SUBDIRECTORY(src/adrt)
# 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
Added: brlcad/branches/cmake/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/adrt/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/adrt/CMakeLists.txt 2010-09-04 17:07:11 UTC
(rev 40463)
@@ -0,0 +1,75 @@
+include_directories(
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${TCL_INCLUDE_PATH}
+ ${BRLCAD_SOURCE_DIR}/src/adrt
+ ${BRLCAD_SOURCE_DIR}/src/adrt/libtie
+ ${BRLCAD_SOURCE_DIR}/src/adrt/libcommon
+ ${BRLCAD_SOURCE_DIR}/src/adrt/librender
+)
+
+add_definitions(
+ -DHAVE_CONFIG_H
+ -DBRLCADBUILD
+)
+
+
+SET(LIBTIE_PRECISION_SRCS "libtie/tie.c;libtie/tie_kdtree.c")
+add_library(tie0 ${LIBTIE_PRECISION_SRCS})
+target_link_libraries(tie0 bu)
+SET_TARGET_PROPERTIES(tie0 PROPERTIES COMPILE_DEFINITIONS "TIE_PRECISION=0")
+add_library(tie ${LIBTIE_PRECISION_SRCS})
+target_link_libraries(tie tie0 bu)
+INSTALL(TARGETS tie LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+SET_TARGET_PROPERTIES(tie PROPERTIES COMPILE_DEFINITIONS "TIE_PRECISION=1")
+
+SET(LIBRENDER_SRCS
+ load.c
+ load_g.c
+ librender/camera.c
+ librender/component.c
+ librender/cut.c
+ librender/depth.c
+ librender/flat.c
+ librender/flos.c
+ librender/grid.c
+ librender/hit.c
+ librender/normal.c
+ librender/path.c
+ librender/phong.c
+ librender/render_util.c
+ librender/spall.c
+ librender/surfel.c
+ librender/texture_blend.c
+ librender/texture_bump.c
+ librender/texture_camo.c
+ librender/texture_checker.c
+ librender/texture_clouds.c
+ librender/texture_gradient.c
+ librender/texture_image.c
+ librender/texture_mix.c
+ librender/texture_perlin.c
+ librender/texture_stack.c
+)
+add_library(render ${LIBRENDER_SRCS})
+target_link_libraries(render tie gcv)
+INSTALL(TARGETS render LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+
+SET(ADRT_MASTER_SRCS
+ master/compnet.c
+ master/dispatcher.c
+ master/tienet_master.c
+ master/master.c
+)
+add_executable(adrt_master ${ADRT_MASTER_SRCS})
+target_link_libraries(adrt_master tie bu ${M_LIBRARY} ${ZLIB_LIBRARY}
+ ${CMAKE_THREAD_LIBS_INIT} ${BSD_LIBRARY})
+INSTALL(TARGETS adrt_master RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+
+SET(ADRT_SLAVE_SRCS
+ slave/slave.c
+ slave/tienet_slave.c
+)
+add_executable(adrt_slave ${ADRT_MASTER_SRCS})
+target_link_libraries(adrt_slave tie render ${CMAKE_THREAD_LIBS_INIT})
+INSTALL(TARGETS adrt_slave RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
Property changes on: brlcad/branches/cmake/src/adrt/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
