[ismrmrd] 196/281: fix #8: cmake now autodetects java include

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag ismrmrd0.5
in repository ismrmrd.

commit 45f2631f542b2044ea06320db5deca845d16ef25
Author: Ghislain Vaillant <ghisvail at gmail.com>
Date:   Fri Jan 10 19:26:59 2014 +0000

    fix #8: cmake now autodetects java include
---
 bindings/CMakeLists.txt      | 9 +++++----
 bindings/java/CMakeLists.txt | 5 +----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index 2b7cda6..f4203f2 100644
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -11,10 +11,11 @@ if(SWIG_FOUND)
         message("PythonLibs not found. Not building Python bindings")
     endif(PYTHONLIBS_FOUND)
 
-    if(DEFINED JAVA_INCLUDE_DIR)
+    find_package(JNI)
+    if(JNI_FOUND)
         add_subdirectory(java)
-    else()
-        message("JAVA_INCLUDE_DIR not defined. Not building Java bindings")
-    endif()
+    else(JNI_FOUND)
+        message("Java Native Interface not found. Not building Java bindings")
+    endif(JNI_FOUND)
 
 endif(SWIG_FOUND)
diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
index 86c2f23..c7202a8 100644
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@@ -1,9 +1,6 @@
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${HDF5_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}/cpp ${Boost_INCLUDE_DIR})
-include_directories(${JAVA_INCLUDE_DIR})
-if (UNIX)
-    include_directories(${JAVA_INCLUDE_DIR}/linux)
-endif (UNIX)
+include_directories(${JNI_INCLUDE_DIRS})
 
 set(CMAKE_SWIG_FLAGS -package org.ismrm.ismrmrd)
 set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git