Revision: 40471
http://brlcad.svn.sourceforge.net/brlcad/?rev=40471&view=rev
Author: starseeker
Date: 2010-09-05 15:29:40 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
Add in some more directories to CMake. Getting close to mged.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/anim/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/cmake/src/canon/CMakeLists.txt
brlcad/branches/cmake/src/fb/CMakeLists.txt
brlcad/branches/cmake/src/fbed/CMakeLists.txt
brlcad/branches/cmake/src/gtools/CMakeLists.txt
brlcad/branches/cmake/src/halftone/CMakeLists.txt
brlcad/branches/cmake/src/irprep/CMakeLists.txt
brlcad/branches/cmake/src/lgt/CMakeLists.txt
brlcad/branches/cmake/src/vfont/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-05 14:08:48 UTC (rev
40470)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-05 15:29:40 UTC (rev
40471)
@@ -712,9 +712,10 @@
THIRD_PARTY_OPTION(UTAHRLE)
THIRD_PARTY_SUBDIR(UTAHRLE src/other/libutahrle)
IF(BRLCAD_BUILD_LOCAL_UTAHRLE)
- SET(BRLCAD_UTAHRLE_INCLUDE_DIR
"${BRLCAD_SOURCE_DIR}/src/other/libutahrle" CACHE STRING "Directory containing
libutahrle headers" FORCE)
+ SET(BRLCAD_UTAHRLE_INCLUDE_DIR
"${BRLCAD_SOURCE_DIR}/src/other/libutahrle/include" CACHE STRING "Directory
containing libutahrle headers" FORCE)
SET(UTAHRLE_INCLUDE_DIR "${BRLCAD_UTAHRLE_INCLUDE_DIR}" CACHE STRING
"Directory containing libutahrle headers" FORCE)
- SET(BRLCAD_UTAHRLE_LIBRARY "libutahrle" CACHE STRING "libutahrle" FORCE)
+ SET(BRLCAD_UTAHRLE_LIBRARY "utahrle" CACHE STRING "libutahrle" FORCE)
+ SET(UTAHRLE_LIBRARY "utahrle" CACHE STRING "libutahrle" FORCE)
ELSE(BRLCAD_BUILD_LOCAL_UTAHRLE)
SET(BRLCAD_UTAHRLE_INCLUDE_DIR "${UTAHRLE_INCLUDE_DIR}" CACHE STRING
"Directory containing libutahrle headers" FORCE)
SET(BRLCAD_UTAHRLE_LIBRARY "${UTAHRLE_LIBRARY}" CACHE STRING
"libutahrle library" FORCE)
@@ -1088,6 +1089,12 @@
# Now that all the tests are done, configure the brlcad_config.h file:
configure_file(${CONFIG_H_FILE} ${BRLCAD_BINARY_DIR}/include/brlcad_config.h)
+# Virtually all of the BRL-CAD code needs the BRL-CAD include directories
+# and a couple of standard defines - set those up in variables now - the
+# idea being that if any other system-wide defines or include are needed
+# they can just be added here.
+SET(BRLCAD_STD_DEFS "-DHAVE_CONFIG_H;-DBRLCADBUILD=1")
+SET(BRLCAD_STD_INCLUDES
"${BRLCAD_BINARY_DIR}/include;${BRLCAD_SOURCE_DIR}/include")
ADD_SUBDIRECTORY(src/libbu)
ADD_SUBDIRECTORY(src/libbn)
@@ -1118,6 +1125,14 @@
ADD_SUBDIRECTORY(src/brlman)
ADD_SUBDIRECTORY(src/burst)
ADD_SUBDIRECTORY(src/bwish)
+ADD_SUBDIRECTORY(src/canon)
+ADD_SUBDIRECTORY(src/fb)
+ADD_SUBDIRECTORY(src/vfont)
+ADD_SUBDIRECTORY(src/fbed)
+ADD_SUBDIRECTORY(src/gtools)
+ADD_SUBDIRECTORY(src/halftone)
+ADD_SUBDIRECTORY(src/irprep)
+ADD_SUBDIRECTORY(src/lgt)
# 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
Modified: brlcad/branches/cmake/src/anim/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/anim/CMakeLists.txt 2010-09-05 14:08:48 UTC
(rev 40470)
+++ brlcad/branches/cmake/src/anim/CMakeLists.txt 2010-09-05 15:29:40 UTC
(rev 40471)
@@ -1,12 +1,10 @@
include_directories(
- ${BRLCAD_BINARY_DIR}/include
- ${BRLCAD_SOURCE_DIR}/include
+ ${BRLCAD_STD_INCLUDES}
${TCL_INCLUDE_PATH}
)
add_definitions(
- -DHAVE_CONFIG_H
- -DBRLCADBUILD=1
+ ${BRLCAD_STD_DEFS}
)
BRLCAD_ADDEXEC(anim_cascade anim_cascade.c bn)
Added: brlcad/branches/cmake/src/canon/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/canon/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/canon/CMakeLists.txt 2010-09-05 15:29:40 UTC
(rev 40471)
@@ -0,0 +1,10 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_STD_INCLUDES}
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+BRLCAD_ADDEXEC(canonize "canonize.c canonlib.c" "fb")
Property changes on: brlcad/branches/cmake/src/canon/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/branches/cmake/src/fb/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/fb/CMakeLists.txt (rev 0)
+++ brlcad/branches/cmake/src/fb/CMakeLists.txt 2010-09-05 15:29:40 UTC (rev
40471)
@@ -0,0 +1,58 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_STD_INCLUDES}
+ ${BRLCAD_PNG_INCLUDE_DIR}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ ${UTAHRLE_INCLUDE_DIR}
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+
+BRLCAD_ADDEXEC(bw-fb bw-fb.c fb)
+BRLCAD_ADDEXEC(cat-fb cat-fb.c fb)
+BRLCAD_ADDEXEC(cell-fb cell-fb.c "bn fb")
+BRLCAD_ADDEXEC(cmap-fb cmap-fb.c fb)
+BRLCAD_ADDEXEC(fb-bw fb-bw.c fb)
+BRLCAD_ADDEXEC(fb-cmap fb-cmap.c fb)
+BRLCAD_ADDEXEC(fb-fb fb-fb.c fb)
+BRLCAD_ADDEXEC(fb-orle "fb-orle.c cmap-crunch.c" "fb orle")
+BRLCAD_ADDEXEC(fb-pix "fb-pix.c cmap-crunch.c" fb)
+BRLCAD_ADDEXEC(fb-png "fb-png.c cmap-crunch.c" fb)
+BRLCAD_ADDEXEC(fb-rle "fb-rle.c cmap-crunch.c" "fb ${UTAHRLE_LIBRARY}")
+BRLCAD_ADDEXEC(fbanim fbanim.c fb)
+BRLCAD_ADDEXEC(fbcbars fbcbars.c fb)
+BRLCAD_ADDEXEC(fbclear fbclear.c fb)
+BRLCAD_ADDEXEC(fbcmap fbcmap.c fb)
+BRLCAD_ADDEXEC(fbcmrot fbcmrot.c fb)
+BRLCAD_ADDEXEC(fbcolor fbcolor.c "fb termio")
+BRLCAD_ADDEXEC(fbfade "fbfade.c ioutil.c" fb)
+BRLCAD_ADDEXEC(fbframe fbframe.c fb)
+BRLCAD_ADDEXEC(fbfree fbfree.c fb)
+BRLCAD_ADDEXEC(fbgamma fbgamma.c fb)
+BRLCAD_ADDEXEC(fbgammamod fbgammamod.c fb)
+BRLCAD_ADDEXEC(fbgrid fbgrid.c fb)
+BRLCAD_ADDEXEC(fbhelp fbhelp.c fb)
+BRLCAD_ADDEXEC(fblabel fblabel.c fb)
+BRLCAD_ADDEXEC(fbline fbline.c fb)
+BRLCAD_ADDEXEC(fbpoint fbpoint.c "bu fb termio pkg")
+BRLCAD_ADDEXEC(fbscanplot fbscanplot.c fb)
+BRLCAD_ADDEXEC(fbstretch "fbstretch.c ioutil.c" fb)
+BRLCAD_ADDEXEC(fbthreadtest fbthreadtest "fb ${TK_LIBRARY}")
+SET_TARGET_PROPERTIES(fbthreadtest PROPERTIES COMPILE_DEFINITIONS "IF_TK")
+BRLCAD_ADDEXEC(fbzoom fbzoom.c "fb termio")
+BRLCAD_ADDEXEC(gif-fb "gif-fb.c ioutil.c" fb)
+BRLCAD_ADDEXEC(gif2fb gif2fb.c fb)
+BRLCAD_ADDEXEC(orle-fb orle-fb.c "fb orle")
+BRLCAD_ADDEXEC(pix-fb pix-fb.c fb)
+BRLCAD_ADDEXEC(pixautosize pixautosize.c fb)
+BRLCAD_ADDEXEC(pixflip-fb pixflip-fb.c fb)
+BRLCAD_ADDEXEC(pl-fb pl-fb.c fb)
+BRLCAD_ADDEXEC(png-fb png-fb.c fb)
+BRLCAD_ADDEXEC(polar-fb polar-fb.c fb)
+BRLCAD_ADDEXEC(pp-fb pp-fb.c "fb termio")
+BRLCAD_ADDEXEC(rle-fb rle-fb.c "fb ${UTAHRLE_LIBRARY}")
+BRLCAD_ADDEXEC(spm-fb spm-fb.c "bn fb")
Property changes on: brlcad/branches/cmake/src/fb/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/branches/cmake/src/fbed/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/fbed/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/fbed/CMakeLists.txt 2010-09-05 15:29:40 UTC
(rev 40471)
@@ -0,0 +1,27 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_STD_INCLUDES}
+ ${BRLCAD_TERMLIB_INCLUDE_DIR}
+ ${TCL_INCLUDE_PATH}
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+SET(fbed_SOURCES
+ char.c
+ empty.c
+ execshell.c
+ fbed.c
+ fill_buf.c
+ getinput.c
+ glob.c
+ pos_pad.c
+ prnt.c
+ sgi_dep.c
+ squash.c
+ try.c
+)
+
+BRLCAD_ADDEXEC(fbed "${fbed_SOURCES}" "vfont fb termio cursor
${TERMLIB_LIBRARY}")
Property changes on: brlcad/branches/cmake/src/fbed/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/branches/cmake/src/gtools/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/gtools/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/gtools/CMakeLists.txt 2010-09-05 15:29:40 UTC
(rev 40471)
@@ -0,0 +1,24 @@
+include_directories(
+ ${BRLCAD_STD_INCLUDES}
+ ${TCL_INCLUDE_PATH}
+ ${BRLCAD_SOURCE_DIR}/src/gtools/beset
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+SET(beset_SRCS
+ beset/beset.c
+ beset/fitness.c
+ beset/population.c
+)
+
+BRLCAD_ADDEXEC(beset "${beset_SRCS}" 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")
+BRLCAD_ADDEXEC(remapid remapid.c "bu librt")
+
+add_executable(g_transfer g_transfer.c)
+target_link_libraries(g_transfer librt pkg)
Property changes on: brlcad/branches/cmake/src/gtools/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/branches/cmake/src/halftone/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/halftone/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/halftone/CMakeLists.txt 2010-09-05 15:29:40 UTC
(rev 40471)
@@ -0,0 +1,20 @@
+include_directories(
+ ${BRLCAD_STD_INCLUDES}
+ ${TCL_INCLUDE_PATH}
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+SET(halftone_SOURCES
+ main.c
+ sharpen.c
+ tone_classic.c
+ tone_floyd.c
+ tone_folly.c
+ tone_simple.c
+ tonescale.c
+)
+
+BRLCAD_ADDEXEC(halftone "${halftone_SOURCES}" "librt fb")
Property changes on: brlcad/branches/cmake/src/halftone/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/branches/cmake/src/irprep/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/irprep/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/irprep/CMakeLists.txt 2010-09-05 15:29:40 UTC
(rev 40471)
@@ -0,0 +1,22 @@
+include_directories(
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${X11_INCLUDE_DIR}
+ ${TCL_INCLUDE_PATH}
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+IF(BRLCAD-ENABLE_X11)
+ BRLCAD_ADDEXEC(ir-X ir-X.c "bu ${X11_LIBRARIES}")
+ BRLCAD_ADDEXEC(irdisp irdisp.c "bu ${X11_LIBRARIES}")
+ENDIF(BRLCAD-ENABLE_X11)
+
+BRLCAD_ADDEXEC(all_sf all_sf.c librt)
+BRLCAD_ADDEXEC(showtherm showtherm.c librt)
+BRLCAD_ADDEXEC(firpass "firpass.c subroutines.c" librt)
+BRLCAD_ADDEXEC(ir-sgi ir-sgi.c bu)
+BRLCAD_ADDEXEC(secpass "secpass.c subroutines.c" librt)
+BRLCAD_ADDEXEC(shapefact shapefact.c librt)
Property changes on: brlcad/branches/cmake/src/irprep/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/branches/cmake/src/lgt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/lgt/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/lgt/CMakeLists.txt 2010-09-05 15:29:40 UTC
(rev 40471)
@@ -0,0 +1,33 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_STD_INCLUDES}
+ ${TCL_INCLUDE_PATH}
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+SET(lgt_SOURCES
+ char.c
+ do_options.c
+ error.c
+ execshell.c
+ fb.c
+ glob.c
+ grid_rotate.c
+ hmenu.c
+ ir.c
+ lgt.c
+ lgt_db.c
+ mat_db.c
+ octree.c
+ prnt.c
+ reflect.c
+ sgi_dep.c
+ texture.c
+ trie.c
+)
+
+BRLCAD_ADDEXEC(lgt "${lgt_SOURCES}" "vfont librt fb termio cursor")
+SET_TARGET_PROPERTIES(lgt PROPERTIES COMPILE_DEFINITIONS "BEHIND_ME_TOL=0.05")
Property changes on: brlcad/branches/cmake/src/lgt/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/branches/cmake/src/vfont/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/vfont/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/vfont/CMakeLists.txt 2010-09-05 15:29:40 UTC
(rev 40471)
@@ -0,0 +1,15 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_STD_INCLUDES}
+ ${TCL_INCLUDE_PATH}
+)
+
+add_definitions(
+ ${BRLCAD_STD_DEFS}
+)
+
+add_library(vfont getfont.c)
+INSTALL(TARGETS vfont LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+
+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)
Property changes on: brlcad/branches/cmake/src/vfont/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
