casa-mp-base

--- java/module/CMakeLists.txt.orig

+++ java/module/CMakeLists.txt

@@ -94,9 +94,9 @@ if ( ENABLE_SWIG_JAVA )

     endforeach(_NDS_FILE ${built_java_sources})

     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/nds2/connection_iterator.java

-                COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/connection_iterator.java ${CMAKE_CURRENT_BINARY_DIR}/nds2/connection_iterator.java

-                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

-            )

+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/connection_iterator.java ${CMAKE_CURRENT_BINARY_DIR}/nds2/connection_iterator.java

+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

+        )

     set(CMAKE_SWIG_FLAGS -O -package nds2)

     set(CMAKE_SWIG_OUTDIR nds2)

@@ -120,35 +120,31 @@ if ( ENABLE_SWIG_JAVA )

         ARGS    -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SWIG_OUTDIR}

         COMMAND ${SWIG_EXECUTABLE}

         ARGS    -java -c++ ${CMAKE_SWIG_FLAGS}

-                -I${CMAKE_CURRENT_BINARY_DIR}

-                -I${CMAKE_CURRENT_SOURCE_DIR}

-                -I${PROJECT_BINARY_DIR}/common/module

-                -I${PROJECT_SOURCE_DIR}/common/module

-                -o ${WRAPPER_FILE}

-                -outdir ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SWIG_OUTDIR}

-                ${INTERFACE_FILE}

-    )

+        -I${CMAKE_CURRENT_BINARY_DIR}

+        -I${CMAKE_CURRENT_SOURCE_DIR}

+        -I${PROJECT_BINARY_DIR}/common/module

+        -I${PROJECT_SOURCE_DIR}/common/module

+        -o ${WRAPPER_FILE}

+        -outdir ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SWIG_OUTDIR}

+        ${INTERFACE_FILE}

+        )

     # -------------------------------------------------------------------

     # swig_link_libraries(nds2JNI -static-libstdc++ ${JNI_LIBRARIES} $<TARGET_OBJECTS:ndswrapcxx_obj> ndsclient)

     # -------------------------------------------------------------------

     add_library( nds2JNI SHARED

         "${CMAKE_CURRENT_BINARY_DIR}/${WRAPPER_FILE}"

-    )

+        )

     target_link_libraries( nds2JNI

         -static-libstdc++

         ${CONLIBNDSCXX_OBJECTS}

         ${JNI_LIBRARIES}

         nds::daqc

-    )

+        )

     if( WIN32 )

         target_link_libraries( nds2JNI nds::cxx Ws2_32 )

     endif( WIN32 )

     target_requires_cpp11(nds2JNI PUBLIC)

-    if ( APPLE )

-        swig_add_library(nds2JNI_rpath LANGUAGE java SOURCES ${INTERFACE_FILE})

-        swig_link_libraries(nds2JNI_rpath ${JNI_LIBRARIES} nds::cxx)

-    endif ( APPLE )

     if (WIN32)

         #................................................................

         # Windows

@@ -161,59 +157,51 @@ if ( ENABLE_SWIG_JAVA )

         # Un*x / OSX

         #................................................................

         set_target_properties(nds2JNI

-           PROPERTIES

+             PROPERTIES

             LIBRARY_OUTPUT_DIRECTORY nds2

-           PREFIX lib

-           SUFFIX .jnilib)

+             PREFIX lib

+             SUFFIX .jnilib)

         if ( APPLE )

-            set_target_properties(nds2JNI_rpath

-               PROPERTIES

-                    BUILD_WITH_INSTALL_RPATH TRUE

-                    LIBRARY_OUTPUT_DIRECTORY rpath/nds2

-                    OUTPUT_NAME nds2JNI

-                   PREFIX lib

-                   SUFFIX .jnilib)

+            set_target_properties(nds2JNI

+                 PROPERTIES

+                INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}"

+                BUILD_WITH_INSTALL_RPATH TRUE )

         endif ( APPLE )

     endif(WIN32)

     #--------------------------------------------------------------------

     # Build the JAR library

     #--------------------------------------------------------------------

-    message("################################ built_java_sources = ${built_java_sources}")