[ismrmrd] 168/281: changing binding install directories to language name

[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 f7b316d67ad0603108fff92a2623a7a431ebd257
Author: Joseph Naegele <joseph.naegele at gmail.com>
Date:   Wed Aug 21 10:53:22 2013 -0400

    changing binding install directories to language name
---
 bindings/java/CMakeLists.txt   |  8 ++++----
 bindings/python/CMakeLists.txt | 22 +++++++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
index 27b7bef..90edc7e 100644
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@@ -21,14 +21,14 @@ add_custom_command(
     POST_BUILD
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Compiling java files and creating jar" VERBATIM
-    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/JNILibLoader.java	
+    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/JNILibLoader.java
                ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd/
     COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd/xmlhdr
-    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/XMLString.java	
+    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/XMLString.java
                ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd/xmlhdr/
     COMMAND sh make_jar.sh
     VERBATIM
 )
 
-install(TARGETS jismrmrd DESTINATION lib)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ismrmrd.jar DESTINATION lib)
+install(TARGETS jismrmrd DESTINATION java)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ismrmrd.jar DESTINATION java)
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index d2c962a..fd5a643 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -7,8 +7,8 @@ set_source_files_properties(ismrmrd_python.i PROPERTIES CPLUSPLUS ON)
 swig_add_module(ismrmrd python ismrmrd_python.i ${CMAKE_SOURCE_DIR}/ismrmrd_hdf5.cpp)
 swig_link_libraries(ismrmrd ${HDF5_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
 
-install(TARGETS ${SWIG_MODULE_ismrmrd_REAL_NAME} DESTINATION lib)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ismrmrd.py DESTINATION lib)
+install(TARGETS ${SWIG_MODULE_ismrmrd_REAL_NAME} DESTINATION python)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ismrmrd.py DESTINATION python)
 
 find_program(PYXBGEN pyxbgen
     HINTS ${PYTHON_HOME} ${PYTHON_LIBRARY}/..
@@ -16,13 +16,21 @@ find_program(PYXBGEN pyxbgen
 
 if(PYXBGEN)
     set(SCHEMA "${CMAKE_SOURCE_DIR}/schema/ismrmrd.xsd")
-    set(XSD_PY "${CMAKE_CURRENT_BINARY_DIR}/ismrmrd_xsd.py")
+    set(XSD_PY_FILE "${CMAKE_CURRENT_BINARY_DIR}/ismrmrd_xsd.py")
+    set(XSD_PY_DIR "${CMAKE_CURRENT_BINARY_DIR}/raw")
+
     add_custom_command(
-        OUTPUT ${XSD_PY}
-        COMMAND ${PYXBGEN} -u "${SCHEMA}" -m ismrmrd_xsd
+        OUTPUT ${XSD_PY_FILE} ${XSD_PY_DIR}
+        COMMAND ${PYXBGEN} -r -u "${SCHEMA}" -m ismrmrd_xsd
+        COMMAND ${CMAKE_COMMAND} -E echo "import" "pyxb.utils.domutils" >> ${XSD_PY_FILE}
+        COMMAND ${CMAKE_COMMAND} -E echo "'pyxb.utils.domutils.BindingDOMSupport.SetDefaultNamespace(Namespace)'" >> ${XSD_PY_FILE}
         DEPENDS ${SCHEMA})
-    add_custom_target(pyismrmrd_xsd ALL DEPENDS ${XSD_PY})
-    install(FILES ${XSD_PY} DESTINATION lib)
+
+    add_custom_target(pyismrmrd_xsd ALL DEPENDS ${XSD_PY_FILE})
+
+    install(FILES ${XSD_PY_FILE} DESTINATION python)
+    install(DIRECTORY ${XSD_PY_DIR} DESTINATION python)
+
 else(PYXBGEN)
     message("Can't find pyxbgen executable. Not building ismrmrd_xsd.py")
 endif(PYXBGEN)

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