[ismrmrd] 140/281: changing bindings to build conditionally

[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 0f8a011cee0a2add54567c662b69f8341a5171ec
Author: Joseph Naegele <joseph.naegele at gmail.com>
Date:   Tue Apr 16 12:11:25 2013 -0400

    changing bindings to build conditionally
---
 CMakeLists.txt                 |  3 +--
 bindings/CMakeLists.txt        | 22 ++++++++++++++++++++--
 bindings/java/CMakeLists.txt   | 10 +++-------
 bindings/python/CMakeLists.txt |  5 -----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80d5b7c..5e6d7d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,9 +66,8 @@ INSTALL(TARGETS ismrmrd DESTINATION lib)
 INSTALL(TARGETS ismrmrd_xsd DESTINATION lib)
 INSTALL(FILES ${MatlabMFiles} DESTINATION matlab/+ismrmrd)
 
-add_subdirectory(bindings)
 add_subdirectory(doc)
 add_subdirectory(examples/c++)
 add_subdirectory(tests)
 add_subdirectory(utilities)
-
+add_subdirectory(bindings)
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index a7c3c69..d2185ff 100644
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -1,4 +1,22 @@
 set_source_files_properties(ismrmrd.i PROPERTIES CPLUSPLUS ON)
 
-add_subdirectory(python)
-add_subdirectory(java)
+find_package(SWIG)
+
+if(SWIG_FOUND)
+
+    include(${SWIG_USE_FILE})
+
+    find_package(PythonLibs)
+    if(PYTHONLIBS_FOUND)
+        add_subdirectory(python)
+    else(PYTHONLIBS_FOUND)
+        message("PythonLibs not found. Not building Python bindings")
+    endif(PYTHONLIBS_FOUND)
+
+    if(DEFINED JAVA_INCLUDE_DIR)
+        add_subdirectory(java)
+    else()
+        message("JAVA_INCLUDE_DIR not defined. Not building Java bindings")
+    endif()
+
+endif(SWIG_FOUND)
diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
index c9638ba..5696d34 100644
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@@ -1,10 +1,5 @@
-find_package(SWIG REQUIRED)
-include(${SWIG_USE_FILE})
-
-find_package(Java REQUIRED)
-
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${JAVA_INCLUDE_DIRS})
+include_directories(${JAVA_INCLUDE_DIR})
 include_directories(${HDF5_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}/cpp ${Boost_INCLUDE_DIR})
 
 set(CMAKE_SWIG_FLAGS -package org.ismrm.ismrmrd)
@@ -13,7 +8,7 @@ set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd)
 set(SWIG_SOURCES ismrmrd_java.i ../../ismrmrd_hdf5.cpp)
 set_source_files_properties(${SWIG_SOURCES} PROPERTIES CPLUSPLUS ON)
 swig_add_module(jismrmrd java ${SWIG_SOURCES})
-swig_link_libraries(jismrmrd ${HDF5_LIBRARIES} ${Boost_LIBRARIES} ${JAVA_LIBRARIES})
+swig_link_libraries(jismrmrd ${HDF5_LIBRARIES} ${Boost_LIBRARIES})
 
 ## TODO: this will NOT work on Windows
 set_source_files_properties(ismrmrd.jar PROPERTIES GENERATED true)
@@ -28,6 +23,7 @@ add_custom_command(
     COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/XMLString.java	
                ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd/xmlhdr/
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/make_jar.sh
+    VERBATIM
 )
 
 install(TARGETS jismrmrd DESTINATION lib)
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index 48d08d0..f916777 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -1,8 +1,3 @@
-find_package(SWIG REQUIRED)
-include(${SWIG_USE_FILE})
-
-find_package(PythonLibs REQUIRED)
-
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${PYTHON_INCLUDE_PATH} ${PYTHON_NUMPY_INCLUDE_DIR})
 include_directories(${HDF5_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}/cpp ${Boost_INCLUDE_DIR})

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