Revision: 44731
http://brlcad.svn.sourceforge.net/brlcad/?rev=44731&view=rev
Author: davidloman
Date: 2011-06-02 18:49:57 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
Remove dependancy for libge. Replaced by simpler BrlcadDb and ExtObject classes
Modified Paths:
--------------
geomcore/trunk/CMakeLists.txt
geomcore/trunk/src/GS/CMakeLists.txt
geomcore/trunk/src/libNet/CMakeLists.txt
geomcore/trunk/tests/func/GS/CMakeLists.txt
geomcore/trunk/tests/func/libNet/CMakeLists.txt
Modified: geomcore/trunk/CMakeLists.txt
===================================================================
--- geomcore/trunk/CMakeLists.txt 2011-06-02 16:24:26 UTC (rev 44730)
+++ geomcore/trunk/CMakeLists.txt 2011-06-02 18:49:57 UTC (rev 44731)
@@ -151,9 +151,6 @@
# If BRL-CAD doesn't provide TCL, we need to find it
find_package(TCL REQUIRED)
-#Libge is required!
-find_package(LIBGE REQUIRED)
-
# Always include the toplevel include dir
include_directories(
${GEOMCORE_SOURCE_DIR}/include
Modified: geomcore/trunk/src/GS/CMakeLists.txt
===================================================================
--- geomcore/trunk/src/GS/CMakeLists.txt 2011-06-02 16:24:26 UTC (rev
44730)
+++ geomcore/trunk/src/GS/CMakeLists.txt 2011-06-02 18:49:57 UTC (rev
44731)
@@ -31,7 +31,6 @@
include_directories(
${TCL_INCLUDE_DIRS}
${BRLCAD_INCLUDE_DIRS}
- ${LIBGE_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
@@ -62,13 +61,13 @@
IF(BUILD_SHARED_LIBS)
add_library(libgeomserv SHARED ${geomserv_SRCS})
- target_link_libraries(libgeomserv libNet libgcutil ${BRLCAD_RT_LIBRARY}
${LIBGE_GE_LIBRARY})
+ target_link_libraries(libgeomserv libNet libgcutil ${BRLCAD_RT_LIBRARY})
set_target_properties(libgeomserv PROPERTIES PREFIX "")
install(TARGETS libgeomserv DESTINATION lib)
ENDIF(BUILD_SHARED_LIBS)
IF(BUILD_STATIC_LIBS)
add_library(libgeomserv-static STATIC ${geomserv_SRCS})
- target_link_libraries(libgeomserv-static libNet libgcutil
${BRLCAD_RT_LIBRARY} ${LIBGE_GE_LIBRARY})
+ target_link_libraries(libgeomserv-static libNet libgcutil
${BRLCAD_RT_LIBRARY})
IF(NOT WIN32)
set_target_properties(libgeomserv-static PROPERTIES PREFIX "")
set_target_properties(libgeomserv-static PROPERTIES OUTPUT_NAME
"libgeomserv")
Modified: geomcore/trunk/src/libNet/CMakeLists.txt
===================================================================
--- geomcore/trunk/src/libNet/CMakeLists.txt 2011-06-02 16:24:26 UTC (rev
44730)
+++ geomcore/trunk/src/libNet/CMakeLists.txt 2011-06-02 18:49:57 UTC (rev
44731)
@@ -26,7 +26,6 @@
include_directories(
${TCL_INCLUDE_DIRS}
${BRLCAD_INCLUDE_DIRS}
- ${LIBGE_INCLUDE_DIR}
)
SET(libNet_SRCS
@@ -60,13 +59,13 @@
IF(BUILD_SHARED_LIBS)
add_library(libNet SHARED ${libNet_SRCS})
- target_link_libraries(libNet libJob libgcutil libEvent
${BRLCAD_RT_LIBRARY} ${LIBGE_GE_LIBRARY} ${BRLCAD_PKG_LIBRARY})
+ target_link_libraries(libNet libJob libgcutil libEvent
${BRLCAD_RT_LIBRARY} ${BRLCAD_PKG_LIBRARY})
set_target_properties(libNet PROPERTIES PREFIX "")
install(TARGETS libNet DESTINATION lib)
ENDIF(BUILD_SHARED_LIBS)
IF(BUILD_STATIC_LIBS)
add_library(libNet-static STATIC ${libNet_SRCS})
- target_link_libraries(libNet-static libJob libgcutil libEvent
${BRLCAD_RT_LIBRARY} ${LIBGE_GE_LIBRARY} ${BRLCAD_PKG_LIBRARY})
+ target_link_libraries(libNet-static libJob libgcutil libEvent
${BRLCAD_RT_LIBRARY} ${BRLCAD_PKG_LIBRARY})
IF(NOT WIN32)
set_target_properties(libNet-static PROPERTIES PREFIX "")
set_target_properties(libNet-static PROPERTIES OUTPUT_NAME
"libNet")
Modified: geomcore/trunk/tests/func/GS/CMakeLists.txt
===================================================================
--- geomcore/trunk/tests/func/GS/CMakeLists.txt 2011-06-02 16:24:26 UTC (rev
44730)
+++ geomcore/trunk/tests/func/GS/CMakeLists.txt 2011-06-02 18:49:57 UTC (rev
44731)
@@ -29,7 +29,6 @@
include_directories(
${TCL_INCLUDE_DIRS}
${BRLCAD_INCLUDE_DIRS}
- ${LIBGE_INCLUDE_DIR}
)
SET (link_libs
@@ -37,7 +36,6 @@
${BRLCAD_BU_LIBRARY}
${BRLCAD_RT_LIBRARY}
${BRLCAD_WDB_LIBRARY}
- ${LIBGE_GE_LIBRARY}
)
add_executable(gsTest GeometryServiceTest.cxx)
Modified: geomcore/trunk/tests/func/libNet/CMakeLists.txt
===================================================================
--- geomcore/trunk/tests/func/libNet/CMakeLists.txt 2011-06-02 16:24:26 UTC
(rev 44730)
+++ geomcore/trunk/tests/func/libNet/CMakeLists.txt 2011-06-02 18:49:57 UTC
(rev 44731)
@@ -29,11 +29,10 @@
include_directories(
${TCL_INCLUDE_DIRS}
${BRLCAD_INCLUDE_DIRS}
- ${LIBGE_INCLUDE_DIR}
)
#add_executable(gNetMsgSerialTest netMsgSerialTest.cxx)
-#target_link_libraries(gNetMsgSerialTest libNet libPkgCpp libgcutil
${LIBGE_GE_LIBRARY} ${BRLCAD_PKG_LIBRARY} ${BRLCAD_BU_LIBRARY})
+#target_link_libraries(gNetMsgSerialTest libNet libPkgCpp libgcutil
${BRLCAD_PKG_LIBRARY} ${BRLCAD_BU_LIBRARY})
add_executable(glibNetTest libNetTest.cxx)
-target_link_libraries(glibNetTest libNet libPkgCpp libgcutil
${LIBGE_GE_LIBRARY} ${BRLCAD_PKG_LIBRARY} ${BRLCAD_BU_LIBRARY})
+target_link_libraries(glibNetTest libNet libPkgCpp libgcutil
${BRLCAD_PKG_LIBRARY} ${BRLCAD_BU_LIBRARY})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Discover what all the cheering's about.
Get your free trial download today.
http://p.sf.net/sfu/quest-dev2dev2
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
