[Sdif-cvs] Easdif/swig/java CMakeLists.txt,1.1,1.2

[Axel R. <ro...@us...>]

Update of /cvsroot/sdif/Easdif/swig/java
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15400/swig/java

Modified Files:
	CMakeLists.txt 
Log Message:
Fixed check target.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/java/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CMakeLists.txt	27 Nov 2006 13:40:05 -0000	1.1
--- CMakeLists.txt	27 Nov 2006 16:53:32 -0000	1.2
***************
*** 15,25 ****
  ADD_DEPENDENCIES(javaswig ${SWIG_MODULE_eaSDIF_REAL_NAME})
  ADD_DEPENDENCIES(${SWIG_MODULE_eaSDIF_REAL_NAME} ${SWIG_COMMON_EASDIF_SRC})
! 
  IF( EXISTS ${JAVA_RUNTIME})
    IF( EXISTS ${JAVA_COMPILE})
      ADD_CUSTOM_TARGET(check
        COMMAND echo Testing java swig interface
!       COMMAND ${JAVA_COMPILE} *.java
!       COMMAND LD_LIBRARY_PATH=$(CMAKE_BINARY_DIR)/easdif ${JAVA_RUNTIME} ${CMAKE_CURRENT_BINARY_DIR}/main)
    ENDIF( EXISTS ${JAVA_RUNTIME})
  ENDIF( EXISTS ${JAVA_COMPILE})
--- 15,36 ----
  ADD_DEPENDENCIES(javaswig ${SWIG_MODULE_eaSDIF_REAL_NAME})
  ADD_DEPENDENCIES(${SWIG_MODULE_eaSDIF_REAL_NAME} ${SWIG_COMMON_EASDIF_SRC})
! CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/main.java.in ${CMAKE_CURRENT_BINARY_DIR}/main.java)
  IF( EXISTS ${JAVA_RUNTIME})
    IF( EXISTS ${JAVA_COMPILE})
+     IF(LINUX)
+       SET(LOADPATH LD_LIBRARY_PATH)
+     ENDIF(LINUX)
+     IF(APPLE)
+       SET(LOADPATH DYLD_LIBRARY_PATH)
+     ENDIF(APPLE)
+     IF(CYGWIN OR MINGW)
+       SET(LOADPATH PATH)
+     ENDIF(CYGWIN OR MINGW)
+ 
      ADD_CUSTOM_TARGET(check
        COMMAND echo Testing java swig interface
!       COMMAND ${CMAKE_COMMAND} -E copy eaSDIF${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}eaSDIF${CMAKE_SHARED_LIBRARY_SUFFIX}
!       COMMAND ${JAVA_COMPILE} ${CMAKE_CURRENT_BINARY_DIR}/*.java
!       COMMAND ${LOADPATH}=. ${JAVA_RUNTIME} ${CMAKE_CURRENT_BINARY_DIR}/main)
    ENDIF( EXISTS ${JAVA_RUNTIME})
  ENDIF( EXISTS ${JAVA_COMPILE})