Commit ec2e4d25 authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'android_mk_support'

5c1b2752 Export VTK targets as Android.mk to the Android NDK build system
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Brad King's avatarBrad King <brad.king@kitware.com>
Merge-request: !3806
parents ccec8c18 5c1b2752
......@@ -9,6 +9,7 @@ vtk_set_with_default(VTK_INSTALL_DOC_DIR "share/doc/${vtk_subdir}")
vtk_set_with_default(VTK_INSTALL_PACKAGE_DIR "${VTK_INSTALL_LIBRARY_DIR}/cmake/${vtk_subdir}")
vtk_set_with_default(VTK_INSTALL_DOXYGEN_DIR "${VTK_INSTALL_DOC_DIR}/doxygen")
vtk_set_with_default(VTK_INSTALL_EXPORT_NAME "VTKTargets")
vtk_set_with_default(VTK_INSTALL_NDK_MODULES_DIR "share/${vtk_subdir}/ndk-modules")
# Set up our directory structure for output libraries and binaries
vtk_set_with_default(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${VTK_BINARY_DIR}/bin")
......
......@@ -545,6 +545,13 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT)
get_property(VTK_TARGETS GLOBAL PROPERTY VTK_TARGETS)
if(VTK_TARGETS)
install(EXPORT ${VTK_INSTALL_EXPORT_NAME} DESTINATION ${VTK_INSTALL_PACKAGE_DIR} FILE ${VTK_INSTALL_EXPORT_NAME}.cmake)
if((NOT CMAKE_VERSION VERSION_LESS 3.7) AND
(CMAKE_SYSTEM_NAME STREQUAL "Android"))
install(
EXPORT_ANDROID_MK ${VTK_INSTALL_EXPORT_NAME}
DESTINATION ${VTK_INSTALL_NDK_MODULES_DIR}
)
endif()
else()
set(CMAKE_CONFIGURABLE_FILE_CONTENT "# No targets!")
configure_file(${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in
......
......@@ -2,6 +2,7 @@
cmake_minimum_required(VERSION 2.8.2)
foreach(p
CMP0022 # CMake 3.0, Define link interface - required by android_mk export
CMP0025 # CMake 3.0
CMP0042 # CMake 3.0, MACOSX_RPATH is enabled by default.
CMP0053 # CMake 3.1
......
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