Changeset 1674 for trunk/bindings

Timestamp:

22/10/11 05:46:21 (7 months ago)

Author:

Freddie Akeroyd

Message:

Fixes for Windows building. refs #281

Location:

trunk/bindings

Files:

• cpp/CMakeLists.txt (modified) (3 diffs)
• java/CMakeLists.txt (modified) (1 diff)

trunk/bindings/cpp/CMakeLists.txt

@@ -27 +27 @@
 #====================================================================
 
-add_definitions(-DIN_NEXUS_CPP_LIBRARY=1)
+add_definitions(-DIN_NEXUS_CPP_LIBRARY=1 )
 
 #Make NeXus CPP Bindings Static Library
@@ -38 +38 @@
 set_target_properties(NeXus_CPP_Static_Library PROPERTIES OUTPUT_NAME NeXusCPP)
 
-target_link_libraries(NeXus_CPP_Static_Library NeXus_Static_Library ${HDF5_LIBRARIES} ${MXML_LINK}
-                      ${HDF4_LINK} ${READLINE_LINK} ${M_LINK} ${DL_LINK} ${PTHREAD_LINK} ${DF_LINK}
+target_link_libraries(NeXus_CPP_Static_Library NeXus_Static_Library 
+                                        ${READLINE_LINK} ${M_LINK} ${DL_LINK} ${PTHREAD_LINK} ${DF_LINK}
                       ${TERMCAP_LINK} ${HISTORY_LINK} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES})
 
@@ -50 +50 @@
                       VERSION 1.0 SOVERSION 4)
 
-target_link_libraries(NeXus_CPP_Shared_Library NeXus_Shared_Library ${HDF5_LIBRARIES} ${MXML_LINK}
-                      ${HDF4_LINK} ${READLINE_LINK} ${M_LINK} ${DL_LINK} ${PTHREAD_LINK} ${DF_LINK}
+target_link_libraries(NeXus_CPP_Shared_Library NeXus_Shared_Library 
+                       ${READLINE_LINK} ${M_LINK} ${DL_LINK} ${PTHREAD_LINK} ${DF_LINK}
                       ${TERMCAP_LINK} ${HISTORY_LINK} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES})
 

trunk/bindings/java/CMakeLists.txt

@@ -134 +134 @@
         SET_TARGET_PROPERTIES(jnexus PROPERTIES VERSION 1.0 SOVERSION 4)
 
-        TARGET_LINK_LIBRARIES(jnexus NeXus_Shared_Library ${HDF5_LIBRARIES}
+        TARGET_LINK_LIBRARIES(jnexus NeXus_Shared_Library 
                       ${READLINE_LINK} ${M_LINK} ${DF_LINK}
                       ${DL_LINK} ${PTHREAD_LINK} ${TERMCAP_LINK} ${HDF4_LINK}