Skip to content
Snippets Groups Projects
Commit bc4923bd authored by Ken Martin's avatar Ken Martin
Browse files

fix ios build issues

The framework was using the vtk version but it was not set
yet in the CMakeLists file.

Old 32 bit architecture was on by default. Rmeoved.
parent 4fbc4a6c
No related branches found
No related tags found
No related merge requests found
......@@ -13,7 +13,7 @@ file(REMOVE_RECURSE ${INSTALL_DIR})
# Define default architectures to compile for
set(IOS_SIMULATOR_ARCHITECTURES "x86_64"
CACHE STRING "iOS Simulator Architectures")
set(IOS_DEVICE_ARCHITECTURES "arm64;armv7"
set(IOS_DEVICE_ARCHITECTURES "arm64"
CACHE STRING "iOS Device Architectures")
list(REMOVE_DUPLICATES IOS_SIMULATOR_ARCHITECTURES)
list(REMOVE_DUPLICATES IOS_DEVICE_ARCHITECTURES)
......
......@@ -13,6 +13,11 @@ if (APPLE)
include(vtkApple)
endif ()
# must be before the following iOS / Android
include(vtkVersion)
set(VTK_VERSION
"${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
option(VTK_IOS_BUILD "Build vtk.framework for iOS" OFF)
mark_as_advanced(VTK_IOS_BUILD)
if (VTK_IOS_BUILD)
......@@ -31,9 +36,6 @@ include(vtkCompilerChecks)
include(vtkCompilerPlatformFlags)
include(vtkCompilerExtraFlags)
include(vtkInitializeBuildType)
include(vtkVersion)
set(VTK_VERSION
"${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
include(vtkSupportMacros)
include(vtkDownload)
include(vtkTesting)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment