Skip to content

Commit

Permalink
Add runtime libraries on Windows for Java binary package
Browse files Browse the repository at this point in the history
Extend VTK_JAVA_INSTALL section to properly integrate
runtime libs in the custom generated package.

Change-Id: I857118e1554ca2d1193048058454f1203e3ae622
  • Loading branch information
jourdain committed Apr 23, 2014
1 parent d895c18 commit cc6002e
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Wrapping/Java/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
# Add the option to package VTK for custom Java packaging
option(VTK_JAVA_INSTALL "Use the Java rules to build the native libraries." OFF)
if(VTK_JAVA_INSTALL)

# Make sure we embed the runtime libraries when packaging the Java binaries
if(WIN32)
# install system runtimes.
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "bin")
include(InstallRequiredSystemLibraries)
endif()

set(VTK_CUSTOM_LIBRARY_SUFFIX "" CACHE STRING "" FORCE)
mark_as_advanced(VTK_CUSTOM_LIBRARY_SUFFIX)
if(APPLE)
Expand Down

0 comments on commit cc6002e

Please sign in to comment.