Revision: 40544
http://brlcad.svn.sourceforge.net/brlcad/?rev=40544&view=rev
Author: starseeker
Date: 2010-09-11 03:57:49 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
Just needed the INCLUDE_FILE checks, from the looks of it
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/librtserver/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-11 00:34:49 UTC (rev
40543)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-11 03:57:49 UTC (rev
40544)
@@ -432,11 +432,6 @@
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})
@@ -548,6 +543,8 @@
BRLCAD_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
BRLCAD_INCLUDE_FILE(winsock.h HAVE_WINSOCK_H)
BRLCAD_INCLUDE_FILE(X11/Xlib.h HAVE_X11_XLIB_H)
+BRLCAD_INCLUDE_FILE(JavaVM/jni.h HAVE_JAVAVM_JNI_H)
+BRLCAD_INCLUDE_FILE(jni.h HAVE_JNI_H)
# C++
BRLCAD_INCLUDE_FILE_CXX(limits HAVE_LIMITS)
Modified: brlcad/branches/cmake/src/librtserver/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/librtserver/CMakeLists.txt 2010-09-11
00:34:49 UTC (rev 40543)
+++ brlcad/branches/cmake/src/librtserver/CMakeLists.txt 2010-09-11
03:57:49 UTC (rev 40544)
@@ -2,7 +2,6 @@
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
${TCL_INCLUDE_PATH}
- ${JAVA_INCLUDE_PATH}
)
add_definitions(
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
