Revision: 40530
http://brlcad.svn.sourceforge.net/brlcad/?rev=40530&view=rev
Author: starseeker
Date: 2010-09-10 18:42:49 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
Add in librtserver, although it's not confirmed working yet and the option
logic for it isn't there yet either.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/cmake/src/librtserver/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-10 17:47:23 UTC (rev
40529)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-10 18:42:49 UTC (rev
40530)
@@ -432,6 +432,11 @@
INCLUDE(${BRLCAD_CMAKE_DIR}/FindGL.cmake)
endif (BRLCAD-ENABLE_OPENGL)
+# Look for Java JNI (librtserver)
+find_package(JNI)
+BRLCAD_INCLUDE_FILE(JavaVM/jni.h HAVE_JAVAVM_JNI_H)
+BRLCAD_INCLUDE_FILE(jni.h HAVE_JNI_H)
+
OPTION(BRLCAD-BUILD_EXTRADOCS "Build Docbook documentation" ON)
OPTION(BRLCAD-BUILD_EXTRADOCS_PDF "Build PDF output from Docbook
documentation" OFF)
OPTION(BRLCAD-BUILD_EXTRADOCS_PDF_MAN "Build PDF output from Docbook
documentation for man pages" ${BRLCAD-BUILD_EXTRADOCS_PDF})
@@ -1174,7 +1179,7 @@
ADD_SUBDIRECTORY(src/conv)
ADD_SUBDIRECTORY(src/fbserv)
ADD_SUBDIRECTORY(src/rt)
-#ADD_SUBDIRECTORY(src/librtserver)
+ADD_SUBDIRECTORY(src/librtserver)
ADD_SUBDIRECTORY(src/libdm)
ADD_SUBDIRECTORY(src/libfft)
ADD_SUBDIRECTORY(src/libicv)
Added: brlcad/branches/cmake/src/librtserver/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/librtserver/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/librtserver/CMakeLists.txt 2010-09-10
18:42:49 UTC (rev 40530)
@@ -0,0 +1,16 @@
+include_directories(
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${TCL_INCLUDE_PATH}
+ ${JAVA_INCLUDE_PATH}
+ )
+
+add_definitions(
+ -DHAVE_CONFIG_H
+ -DBRLCADBUILD
+ )
+
+BRLCAD_ADDLIB(rtserver rtserver.c "bu bn librt")
+
+add_executable(rtserverTest rtserverTest.c)
+target_link_libraries(rtserverTest bu rtserver)
Property changes on: brlcad/branches/cmake/src/librtserver/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.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
