diff --git a/contrib/mobile/CMakeLists.txt b/contrib/mobile/CMakeLists.txt index 19ec84210b1202ea1b8d5d51f73cb4ecc80896d4..5ac87d54f1066f1ffa1e6bca400bffa9ed8b3528 100644 --- a/contrib/mobile/CMakeLists.txt +++ b/contrib/mobile/CMakeLists.txt @@ -32,20 +32,29 @@ endmacro(copy_headers) if(ENABLE_BUILD_IOS_EMULATOR OR ENABLE_BUILD_IOS) # we need getdp framework - find_path(GETDP_FRAMEWORK "GetDP" GetDP.framework) - if(NOT GETDP_FRAMEWORK) - message(SEND_ERROR "Cannot compile onelab for iOS without GetDP") - endif(NOT GETDP_FRAMEWORK) + find_path(GETDP_FRAMEWORK GetDP.framework) + if(GETDP_FRAMEWORK) + set(GETDP_FRAMEWORK ${GETDP_FRAMEWORK}/GetDP.framework) + message(STATUS "Found " ${GETDP_FRAMEWORK}) + else(GETDP_FRAMEWORK) + message(SEND_ERROR "Could not find GetDP.framework") + endif(GETDP_FRAMEWORK) # we also need gmsh framework - find_path(GMSH_FRAMEWORK "Gmsh" Gmsh.framework) - if(NOT GMSH_FRAMEWORK) - message(SEND_ERROR "Cannot compile onelab for iOS without Gmsh") - endif(NOT GMSH_FRAMEWORK) + find_path(GMSH_FRAMEWORK Gmsh.framework) + if(GMSH_FRAMEWORK) + set(GMSH_FRAMEWORK ${GMSH_FRAMEWORK}/Gmsh.framework) + message(STATUS "Found " ${GMSH_FRAMEWORK}) + else(GMSH_FRAMEWORK) + message(SEND_ERROR "Could not find Gmsh.framework") + endif(GMSH_FRAMEWORK) # and we also need PETSc - find_path(PETSC_FRAMEWORK "petsc" petsc.framework) - if(NOT PETSC_FRAMEWORK) - message(SEND_ERROR "Cannot compile onelab for iOS without PETSc") - endif(NOT PETSC_FRAMEWORK) + find_path(PETSC_FRAMEWORK petsc.framework) + if(PETSC_FRAMEWORK) + set(PETSC_FRAMEWORK ${PETSC_FRAMEWORK}/petsc.framework) + message(STATUS "Found " ${PETSC_FRAMEWORK}) + else(PETSC_FRAMEWORK) + message(SEND_ERROR "Could not find petsc.framework") + endif(PETSC_FRAMEWORK) # add target add_custom_target(xcodeProject COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/Onelab/ @@ -74,6 +83,13 @@ if(ENABLE_BUILD_IOS_EMULATOR OR ENABLE_BUILD_IOS) copy_headers(${GETDP_FRAMEWORK}/Headers/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/GetDP.framework/Headers/) copy_headers(${GMSH_FRAMEWORK}/Headers/gmsh/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/Gmsh.framework/Headers/) copy_headers(${PETSC_FRAMEWORK}/Headers/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/petsc.framework/Headers/) + + message(STATUS "") + message(STATUS "ONELAB for iOS successfully configured:") + message(STATUS " * Run `make xcodeProject' to create the XCode project") + message(STATUS " * Then run `open Onelab/Onelab.xcodeproj' to launch XCode") + message(STATUS "") + endif(ENABLE_BUILD_IOS_EMULATOR OR ENABLE_BUILD_IOS) if(ENABLE_BUILD_ANDROID) diff --git a/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj b/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj index 72fce9261ae9bbeb2569fe4f877e7a8d370518fc..6b434f3bcac38de1443a0cd8085a13b72fdd9468 100644 --- a/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj +++ b/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj @@ -241,6 +241,11 @@ attributes = { LastUpgradeCheck = 0460; ORGANIZATIONNAME = "Maxime Graulich"; + TargetAttributes = { + 9C9608351712C16300E1D4A0 = { + DevelopmentTeam = 7KGA566932; + }; + }; }; buildConfigurationList = 9C9608301712C16300E1D4A0 /* Build configuration list for PBXProject "Onelab" */; compatibilityVersion = "Xcode 3.2"; @@ -349,7 +354,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; @@ -376,7 +381,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -390,8 +395,8 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/Onelab/frameworks\"", @@ -399,10 +404,11 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Onelab/Onelab-Prefix.pch"; INFOPLIST_FILE = "Onelab/Onelab-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = armv7; WRAPPER_EXTENSION = app; @@ -413,8 +419,8 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../../getdp-iOS\"", @@ -425,9 +431,10 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Onelab/Onelab-Prefix.pch"; INFOPLIST_FILE = "Onelab/Onelab-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = armv7; WRAPPER_EXTENSION = app;