Changeset 1625 for trunk/bindings

Timestamp:

05/08/11 16:25:35 (10 months ago)

Author:

Stephen Rankin

Message:

More updates for Windows build. ref#236.

Location:

trunk/bindings

Files:

• CMakeLists.txt (modified) (2 diffs)
• java/CMakeLists.txt (modified) (3 diffs)

trunk/bindings/CMakeLists.txt

@@ +1 @@
+## Process this file with cmake
+#====================================================================
+#  NeXus - Neutron & X-ray Common Data Format
+#  
+#  CMakeLists for building the NeXus library and applications.
+#
+#  Copyright (C) 2011 Stephen Rankin
+#  
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2 of the License, or (at your option) any later version.
+# 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+# 
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free 
+#  Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
+#  MA  02111-1307  USA
+#             
+#  For further information, see <http://www.neutron.anl.gov/NeXus/>
+#
+#
+#====================================================================
 # Recurse into the subdirectories.
 add_subdirectory (cpp)
@@ -8 +35 @@
 add_subdirectory (java)
 #add_subdirectory (matlab)
-add_subdirectory (python)
+if (PYTHONINTERP_FOUND)
+    add_subdirectory (python)
+endif (PYTHONINTERP_FOUND)
 #add_subdirectory (swig)

trunk/bindings/java/CMakeLists.txt

@@ -103 +103 @@
         ADD_CUSTOM_COMMAND( 
             OUTPUT    ${JNI_HEADER}
-            COMMAND   ${JAVA_NATIVE}
+            COMMAND   ${Java_JNI_EXECUTABLE}
             ARGS      -jni -d native -classpath . org.nexusformat.NexusFile
             DEPENDS   ${JAR_ARCHIVE}
@@ -111 +111 @@
         ADD_CUSTOM_COMMAND( 
             OUTPUT    ${JAVA_DOCS}
-            COMMAND   ${JAVA_DOC}
+            COMMAND   ${Java_DOC_EXECUTABLE}
             ARGS      -d ${JAVA_DOCS} -windowtitle jnexus -doctitle jnexus -classpath . 
                       -sourcepath ${CMAKE_SOURCE_DIR}/bindings/java org.nexusformat ncsa.hdf.hdflib
@@ -135 +135 @@
 
         TARGET_LINK_LIBRARIES(jnexus NeXus_Shared_Library ${HDF5_LIBRARIES}
-                      ${MXML_LINK} ${READLINE_LINK} ${M_LINK} ${DF_LINK}
+                      ${READLINE_LINK} ${M_LINK} ${DF_LINK}
                       ${DL_LINK} ${PTHREAD_LINK} ${TERMCAP_LINK} ${HDF4_LINK}
                       ${HISTORY_LINK} ${JPEG_LIBRARIES} ${ZIP_LIB} ${SZIP_LIB}