Skip to content
Snippets Groups Projects
Commit 3df4098d authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

support iOS11

parent a7c1f5a8
Branches
Tags
No related merge requests found
......@@ -579,6 +579,7 @@ if(ENABLE_BUILD_IOS)
if(NOT CMAKE_TOOLCHAIN_FILE)
message(FATAL_ERROR "Cannot compile Gmsh for iOS without a toolchain")
endif(NOT CMAKE_TOOLCHAIN_FILE)
add_definitions(-DBUILD_IOS)
endif(ENABLE_BUILD_IOS)
if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
......
......@@ -579,6 +579,8 @@ int SystemCallExe(const std::string &exe, const std::string &argsOrCommand,
&suInfo, &prInfo);
}
}
#elif(BUILD_IOS)
Msg::Warning("SystemCall is not supported on iOS");
#else
std::string cmd(command);
if(isPython || isOctave || isExe){
......
......@@ -1548,6 +1548,7 @@ namespace onelab{
}
void runNonBlockingSubClient(const std::string &name, const std::string &command)
{
#if !defined(BUILD_IOS)
if(!_gmshClient){
int res = system(command.c_str());
if(res){
......@@ -1555,6 +1556,7 @@ namespace onelab{
}
return;
}
#endif
std::string msg = name + parameter::charSep() + command;
_gmshClient->SendMessage(GmshSocket::GMSH_CONNECT, msg.size(), &msg[0]);
_numSubClients += 1;
......
......@@ -465,6 +465,7 @@
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Onelab/Onelab-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (BUILD_IOS, "DEBUG=1", "$(inherited)");
INFOPLIST_FILE = "Onelab/Onelab-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LIBRARY_SEARCH_PATHS = (
......@@ -493,6 +494,7 @@
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Onelab/Onelab-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = BUILD_IOS;
INFOPLIST_FILE = "Onelab/Onelab-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LIBRARY_SEARCH_PATHS = (
......
......@@ -44,6 +44,8 @@
<true/>
<key>UIFileSharingEnabled</key>
<true/>
<key>LSSupportsOpeningDocumentsInPlace</key>
<true/>
<key>UIMainStoryboardFile</key>
<string>iPhoneiPodStoryboard</string>
<key>UIMainStoryboardFile~ipad</key>
......
......@@ -177,8 +177,3 @@ double strtod$UNIX2003(const char *restrict nptr, char **restrict endptr)
{
return strtod(nptr, endptr);
}
int system$UNIX2003(const char *command)
{
return system(command);
}
......@@ -54,7 +54,7 @@ getdp_framework="$frameworks_dir/GetDP.framework"
occt_framework="$frameworks_dir/OCCT.framework"
if [ $enable_simulator != 0 ]; then
cmake_default="-DDEFAULT=0 -DCMAKE_TOOLCHAIN_FILE=$gmsh_git/contrib/mobile/utils/iOS.cmake -DIOS_PLATFORM=SIMULATOR -DENABLE_BUILD_IOS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=i386;x86_64 -GXcode"
cmake_default="-DDEFAULT=0 -DCMAKE_TOOLCHAIN_FILE=$gmsh_git/contrib/mobile/utils/iOS.cmake -DIOS_PLATFORM=SIMULATOR -DENABLE_BUILD_IOS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=x86_64 -GXcode"
else
cmake_default="-DDEFAULT=0 -DCMAKE_TOOLCHAIN_FILE=$gmsh_git/contrib/mobile/utils/iOS.cmake -DIOS_PLATFORM=OS -DENABLE_BUILD_IOS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=armv7;armv7s;arm64 -GXcode"
fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment