Revision: 40488
http://brlcad.svn.sourceforge.net/brlcad/?rev=40488&view=rev
Author: starseeker
Date: 2010-09-07 18:08:41 +0000 (Tue, 07 Sep 2010)
Log Message:
-----------
Switch all the libraries over to using our ADDLIB macro, in preparation for
adding in a static option.
Modified Paths:
--------------
brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
brlcad/branches/cmake/src/adrt/CMakeLists.txt
brlcad/branches/cmake/src/libanalyze/CMakeLists.txt
brlcad/branches/cmake/src/libbn/CMakeLists.txt
brlcad/branches/cmake/src/libbu/CMakeLists.txt
brlcad/branches/cmake/src/libcursor/CMakeLists.txt
brlcad/branches/cmake/src/libdm/CMakeLists.txt
brlcad/branches/cmake/src/libfb/CMakeLists.txt
brlcad/branches/cmake/src/libfft/CMakeLists.txt
brlcad/branches/cmake/src/libgcv/CMakeLists.txt
brlcad/branches/cmake/src/libged/CMakeLists.txt
brlcad/branches/cmake/src/libicv/CMakeLists.txt
brlcad/branches/cmake/src/libmultispectral/CMakeLists.txt
brlcad/branches/cmake/src/liboptical/CMakeLists.txt
brlcad/branches/cmake/src/liborle/CMakeLists.txt
brlcad/branches/cmake/src/libpkg/CMakeLists.txt
brlcad/branches/cmake/src/librt/CMakeLists.txt
brlcad/branches/cmake/src/libsysv/CMakeLists.txt
brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
brlcad/branches/cmake/src/libtermio/CMakeLists.txt
brlcad/branches/cmake/src/libwdb/CMakeLists.txt
brlcad/branches/cmake/src/other/libregex/CMakeLists.txt
brlcad/branches/cmake/src/vfont/CMakeLists.txt
Modified: brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -10,6 +10,8 @@
STRING(REGEX REPLACE " " ";" srcslist "${srcs}")
STRING(REGEX REPLACE " " ";" libslist "${libs}")
add_library(${libname} ${srcslist})
- target_link_libraries(${libname} ${libslist})
+ if(NOT ${libs} MATCHES "NONE")
+ target_link_libraries(${libname} ${libslist})
+ endif(NOT ${libs} MATCHES "NONE")
INSTALL(TARGETS ${libname} DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
ENDMACRO(BRLCAD_ADDLIB libname srcs libs)
Modified: brlcad/branches/cmake/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/adrt/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/adrt/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -18,9 +18,7 @@
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 DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(tie "${LIBTIE_PRECISION_SRCS}" "tie0 bu")
SET_TARGET_PROPERTIES(tie PROPERTIES COMPILE_DEFINITIONS "TIE_PRECISION=1")
SET(LIBRENDER_SRCS
@@ -51,9 +49,7 @@
librender/texture_perlin.c
librender/texture_stack.c
)
-add_library(render ${LIBRENDER_SRCS})
-target_link_libraries(render tie gcv)
-INSTALL(TARGETS render DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(render "${LIBRENDER_SRCS}" "tie gcv")
SET(ADRT_MASTER_SRCS
master/compnet.c
@@ -61,15 +57,10 @@
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})
+BRLCAD_ADDEXEC(adrt_master "${ADRT_MASTER_SRCS}" "tie bu ${M_LIBRARY}
${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${BSD_LIBRARY}")
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})
+BRLCAD_ADDEXEC(adrt_slave "${ADRT_MASTER_SRCS}" "tie render
${CMAKE_THREAD_LIBS_INIT}")
Modified: brlcad/branches/cmake/src/libanalyze/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libanalyze/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libanalyze/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -14,6 +14,4 @@
-DBRLCADBUILD
)
-add_library(analyze ${LIBANALYZE_SOURCES})
-target_link_libraries(analyze bu)
-INSTALL(TARGETS analyze DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(analyze "${LIBANALYZE_SOURCES}" bu)
Modified: brlcad/branches/cmake/src/libbn/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libbn/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libbn/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -41,8 +41,6 @@
-DBRLCADBUILD
)
-add_library(bn ${LIBBN_SOURCES})
-target_link_libraries(bn bu)
-INSTALL(TARGETS bn DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(bn "${LIBBN_SOURCES}" bu)
install(FILES libplot3.3 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libbu/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libbu/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -86,9 +86,7 @@
-DBRLCADBUILD
)
-add_library(bu ${LIBBU_SOURCES})
-target_link_libraries(bu ${CMAKE_THREAD_LIBS_INIT} ${BRLCAD_PNG_LIB_NAME}
${TCL_LIBRARY} )
-INSTALL(TARGETS bu DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(bu "${LIBBU_SOURCES}" "${CMAKE_THREAD_LIBS_INIT}
${BRLCAD_PNG_LIB_NAME} ${TCL_LIBRARY}")
set(HTESTER_SOURCES
htester.c
Modified: brlcad/branches/cmake/src/libcursor/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libcursor/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libcursor/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -10,8 +10,6 @@
-DBRLCADBUILD
)
-add_library(cursor cursor.c)
-target_link_libraries(cursor ${BRLCAD_TERMLIB_LIBRARY})
-INSTALL(TARGETS cursor DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(cursor cursor.c "${BRLCAD_TERMLIB_LIBRARY}")
install(FILES libcursor.3 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -16,6 +16,7 @@
IF(TK_LIBRARY)
SET(DM_DEFINES "${DM_DEFINES} -DDM_TK -DIF_TK")
+ SET(DM_TKLIB ${TK_LIBRARY})
ENDIF(TK_LIBRARY)
@@ -62,8 +63,8 @@
${DM_DEFINES}
)
-add_library(dm ${LIBDM_SRCS})
-MESSAGE("X11_LIBRARIES: ${X11_LIBRARIES} ${X11_Xi_LIB}")
-target_link_libraries(dm librt fb ged ${X11_LIBRARIES} ${X11_Xi_LIB})
-INSTALL(TARGETS dm DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+FOREACH(xlib ${X11_LIBRARIES})
+ SET(DM_XLIBS "${DM_XLIBS} ${xlib}")
+ENDFOREACH(xlib ${X11_LIBRARIES})
+BRLCAD_ADDLIB(dm "${LIBDM_SRCS}" "librt fb ged ${DM_XLIBS} ${X11_Xi_LIB}
${DM_TKLIB}")
Modified: brlcad/branches/cmake/src/libfb/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libfb/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libfb/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -2,14 +2,16 @@
SET(INCLUDEDIRS "")
if(BRLCAD-ENABLE_X11 AND X11_FOUND)
SET(FBX11DEFS "-DIF_X")
- SET(LINKLIBS "${LINKLIBS} ${X11_LIBRARIES}")
- STRING(STRIP "${LINKLIBS}" LINKLIBS)
+ FOREACH(xlib ${X11_LIBRARIES})
+ SET(LINKLIBS "${LINKLIBS} ${xlib}")
+ ENDFOREACH(xlib ${X11_LIBRARIES})
SET(INCLUDEDIRS "${INCLUDEDIRS} ${X11_INCLUDE_DIR}")
endif()
if(BRLCAD-ENABLE_OPENGL AND OPENGL_FOUND)
SET(FBOGLDEFS "-DIF_OGL")
- SET(LINKLIBS "${LINKLIBS} ${OPENGL_LIBRARIES}")
- STRING(STRIP "${LINKLIBS}" LINKLIBS)
+ FOREACH(ogllib ${OPENGL_LIBRARIES})
+ SET(LINKLIBS "${LINKLIBS} ${ogllib}")
+ ENDFOREACH(ogllib ${OPENGL_LIBRARIES})
SET(INCLUDEDIRS "${INCLUDEDIRS} ${OPENGL_INCLUDE_DIR}")
endif()
@@ -54,8 +56,6 @@
${FBOGLDEFS}
)
-add_library(fb ${LIBFB_SOURCES})
-target_link_libraries(fb bu pkg ${BRLCAD_PNG_LIB_NAME} ${TCL_LIBRARY}
${TK_LIBRARY} ${LINKLIBS})
-INSTALL(TARGETS fb DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(fb "${LIBFB_SOURCES}" "bu pkg ${LINKLIBS}")
install(FILES libfb.3 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/libfft/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libfft/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libfft/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -40,9 +40,8 @@
ditsplit.c
${FFT_GEN_SRCS}
)
-add_library(fft ${LIBFFT_SRCS})
-target_link_libraries(fft)
-INSTALL(TARGETS fft DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+
+BRLCAD_ADDLIB(fft "${LIBFFT_SRCS}" "NONE")
SET_TARGET_PROPERTIES(fft PROPERTIES LINKER_LANGUAGE C)
add_executable(fftest fftest.c)
Modified: brlcad/branches/cmake/src/libgcv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libgcv/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libgcv/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -14,6 +14,4 @@
-DBRLCADBUILD
)
-add_library(gcv ${LIBGCV_SOURCES})
-target_link_libraries(gcv bu librt)
-INSTALL(TARGETS gcv DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(gcv "${LIBGCV_SOURCES}" "bu librt")
Modified: brlcad/branches/cmake/src/libged/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libged/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libged/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -270,6 +270,4 @@
-DBRLCADBUILD
)
-add_library(ged ${LIBGED_SOURCES})
-target_link_libraries(ged bu librt wdb analyze)
-INSTALL(TARGETS ged DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(ged "${LIBGED_SOURCES}" "bu librt wdb analyze")
Modified: brlcad/branches/cmake/src/libicv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libicv/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libicv/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -13,4 +13,4 @@
-DBRLCADBUILD
)
-add_library(libicv ${LIBICV_SOURCES})
+BRLCAD_ADDLIB(libicv "${LIBICV_SOURCES}" bu)
Modified: brlcad/branches/cmake/src/libmultispectral/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libmultispectral/CMakeLists.txt 2010-09-07
17:13:51 UTC (rev 40487)
+++ brlcad/branches/cmake/src/libmultispectral/CMakeLists.txt 2010-09-07
18:08:41 UTC (rev 40488)
@@ -9,6 +9,4 @@
-DRT_MULTISPECTRAL
)
-add_library(multispectral init.c sh_temp.c)
-target_link_libraries(multispectral optical librt)
-INSTALL(TARGETS multispectral DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(multispectral "init.c sh_temp.c" "optical librt")
Modified: brlcad/branches/cmake/src/liboptical/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/liboptical/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/liboptical/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -51,6 +51,4 @@
-DBRLCADBUILD
)
-add_library(optical ${LIBOPTICAL_SOURCES})
-target_link_libraries(optical bu bn librt)
-INSTALL(TARGETS optical DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(optical "${LIBOPTICAL_SOURCES}" "bu bn librt")
Modified: brlcad/branches/cmake/src/liborle/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/liborle/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/liborle/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -13,7 +13,6 @@
-DBRLCADBUILD
)
-add_library(orle ${LIBORLE_SOURCES})
-INSTALL(TARGETS orle DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(orle "${LIBORLE_SOURCES}" "NONE")
install(FILES liborle.3 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/libpkg/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libpkg/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libpkg/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -15,6 +15,4 @@
-DBRLCADBUILD
)
-add_library(pkg ${LIBPKG_SOURCES})
-target_link_libraries(pkg bu)
-INSTALL(TARGETS pkg DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(pkg "${LIBPKG_SOURCES}" bu)
Modified: brlcad/branches/cmake/src/librt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/librt/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/librt/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -254,9 +254,7 @@
)
endif(MSVC)
-add_library(librt ${LIBRT_SOURCES})
+BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}" "bu bn ${BRLCAD_OPENNURBS_LIBRARY}
${BRLCAD_REGEX_LIBRARY} ${BRLCAD_ZLIB_LIBRARY}")
set_target_properties(librt PROPERTIES PREFIX "")
-target_link_libraries(librt bu bn ${BRLCAD_OPENNURBS_LIBRARY}
${BRLCAD_REGEX_LIBRARY} ${BRLCAD_ZLIB_LIBRARY} ${TCL_LIBRARY})
-INSTALL(TARGETS librt DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
install(FILES librt.3 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/libsysv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libsysv/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libsysv/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -22,6 +22,4 @@
-DHAVE_STRTOK
)
-add_library(sysv ${LIBSYSV_SOURCES})
-target_link_libraries(sysv ${TCL_LIBRARY})
-INSTALL(TARGETS sysv DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(sysv "${LIBSYSV_SOURCES}" "${TCL_LIBRARY}")
Modified: brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libtclcad/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libtclcad/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -29,6 +29,7 @@
${TCLCAD_DEFINES}
)
-add_library(tclcad tclcad.c tclcadAutoPath.c tkImgFmtPIX.c ged_obj.c)
-target_link_libraries(tclcad dm ged ${X11_LIBRARIES} ${X11_Xi_LIB})
-INSTALL(TARGETS tclcad DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+FOREACH(xlib ${X11_LIBRARIES})
+ SET(TCLCAD_XLIBS "${TCLCAD_XLIBS} ${xlib}")
+ENDFOREACH(xlib ${X11_LIBRARIES})
+BRLCAD_ADDLIB(tclcad "tclcad.c tclcadAutoPath.c tkImgFmtPIX.c ged_obj.c" "dm
ged ${TCLCAD_XLIBS} ${X11_Xi_LIB}")
Modified: brlcad/branches/cmake/src/libtermio/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libtermio/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libtermio/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -9,6 +9,4 @@
-DBRLCADBUILD
)
-add_library(termio termio.c)
-target_link_libraries(termio ${BRLCAD_TERMLIB_LIBRARY})
-INSTALL(TARGETS termio DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(termio termio.c "${BRLCAD_TERMLIB_LIBRARY}")
Modified: brlcad/branches/cmake/src/libwdb/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libwdb/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/libwdb/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -47,8 +47,6 @@
)
endif(MSVC)
-add_library(wdb ${LIBWDB_SOURCES})
-target_link_libraries(wdb librt bu bn sysv ${BRLCAD_OPENNURBS_LIBRARY}
${BRLCAD_REGEX_LIBRARY} ${BRLCAD_ZLIB_LIBRARY} ${TCL_LIBRARY})
-INSTALL(TARGETS wdb DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(wdb "${LIBWDB_SOURCES}" "librt bu bn sysv
${BRLCAD_OPENNURBS_LIBRARY} ${BRLCAD_REGEX_LIBRARY} ${BRLCAD_ZLIB_LIBRARY}")
install(FILES libwdb.3 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/other/libregex/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libregex/CMakeLists.txt 2010-09-07
17:13:51 UTC (rev 40487)
+++ brlcad/branches/cmake/src/other/libregex/CMakeLists.txt 2010-09-07
18:08:41 UTC (rev 40488)
@@ -10,7 +10,8 @@
)
include_directories(
- ../../../include
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
)
add_library(regex ${LIBREGEX_SOURCES})
Modified: brlcad/branches/cmake/src/vfont/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/vfont/CMakeLists.txt 2010-09-07 17:13:51 UTC
(rev 40487)
+++ brlcad/branches/cmake/src/vfont/CMakeLists.txt 2010-09-07 18:08:41 UTC
(rev 40488)
@@ -8,8 +8,7 @@
${BRLCAD_STD_DEFS}
)
-add_library(vfont getfont.c)
-INSTALL(TARGETS vfont DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+BRLCAD_ADDLIB(vfont getfont.c 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)
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
