Commit 0ae9a6d7 authored by Sebastien Jourdain's avatar Sebastien Jourdain Committed by Code Review
Browse files

Merge topic 'fix-java-windows-install-rules' into master

40e24641 Provide valid dll directory path for Java install rules
parents d44754cc 40e24641
...@@ -7,6 +7,7 @@ include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) ...@@ -7,6 +7,7 @@ include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
option(VTK_JAVA_INSTALL "Use the Java rules to build the native libraries." OFF) option(VTK_JAVA_INSTALL "Use the Java rules to build the native libraries." OFF)
if(VTK_JAVA_INSTALL) if(VTK_JAVA_INSTALL)
set(VTK_CUSTOM_LIBRARY_SUFFIX "" CACHE STRING "" FORCE) set(VTK_CUSTOM_LIBRARY_SUFFIX "" CACHE STRING "" FORCE)
mark_as_advanced(VTK_CUSTOM_LIBRARY_SUFFIX)
if(APPLE) if(APPLE)
set(CMAKE_INSTALL_NAME_DIR @loader_path CACHE STRING "" FORCE) set(CMAKE_INSTALL_NAME_DIR @loader_path CACHE STRING "" FORCE)
mark_as_advanced(CMAKE_INSTALL_NAME_DIR) mark_as_advanced(CMAKE_INSTALL_NAME_DIR)
......
...@@ -4,10 +4,22 @@ set(NATIVE_NAME "natives-@MAVEN_LOCAL_NATIVE_NAME@") ...@@ -4,10 +4,22 @@ set(NATIVE_NAME "natives-@MAVEN_LOCAL_NATIVE_NAME@")
message("Package VTK for Java - ${NATIVE_NAME}") message("Package VTK for Java - ${NATIVE_NAME}")
# Create the natives directory # Create the natives directory
file (COPY "${CMAKE_INSTALL_PREFIX}/@VTK_INSTALL_LIBRARY_DIR@/"
# Only for windows but no harm to do it always
file (COPY "${CMAKE_INSTALL_PREFIX}/bin/"
DESTINATION "${CMAKE_INSTALL_PREFIX}/${NATIVE_NAME}" DESTINATION "${CMAKE_INSTALL_PREFIX}/${NATIVE_NAME}"
FILES_MATCHING FILES_MATCHING
PATTERN *.dll PATTERN *.dll
PATTERN *.jnilib
PATTERN *.cmake
PATTERN *.txt
PATTERN *.in
)
# For Apple and Linux
file (COPY "${CMAKE_INSTALL_PREFIX}/@VTK_INSTALL_LIBRARY_DIR@/"
DESTINATION "${CMAKE_INSTALL_PREFIX}/${NATIVE_NAME}"
FILES_MATCHING
PATTERN *.so PATTERN *.so
PATTERN *.dylib PATTERN *.dylib
PATTERN *.jnilib PATTERN *.jnilib
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment