firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 22:03:03 +01:00
Code Issues

[build] [cmake] Add some iOS ifdefs. Hide wrong include dir during crosscompiling.

Browse Source
This commit is contained in:
egorpugin 2015-03-19 11:34:04 +00:00
parent b1aca05e3a
commit 11cbc139d8
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -228,8 +228,8 @@ endif()
if (APPLE) if (APPLE)
set(OS_DIR darwin) set(OS_DIR darwin)
include_directories(/opt/local/include)
if (NOT CMAKE_CROSSCOMPILING) if (NOT CMAKE_CROSSCOMPILING)
include_directories(/opt/local/include)
link_directories(/opt/local/lib) link_directories(/opt/local/lib)
endif() endif()

2
builds/cmake/Configure.cmake
View File

@ -66,7 +66,7 @@ if (ANDROID)
endif() endif()
if (IOS) if (IOS)
set(CMAKE_SYSTEM_PROCESSOR "arm") # armv7 ? set(CMAKE_SYSTEM_PROCESSOR "armv7")
add_definitions(-D__arm__) add_definitions(-D__arm__)
endif() endif()

2
src/isql/InputDevices.cpp
View File

@ -22,7 +22,7 @@
*/ */
#include "firebird.h" #include "firebird.h"
#ifdef DARWIN #if defined(DARWIN) && !defined(IOS)
#if defined(i386) || defined(__x86_64__) #if defined(i386) || defined(__x86_64__)
#include <architecture/i386/io.h> #include <architecture/i386/io.h>
#else #else

2
src/yvalve/config/os/darwin/config_root.cpp
View File

@ -37,7 +37,9 @@
#include "../common/os/path_utils.h" #include "../common/os/path_utils.h"
#include "../common/file_params.h" #include "../common/file_params.h"
#ifndef IOS
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#endif
#include <CoreFoundation/CFBundle.h> #include <CoreFoundation/CFBundle.h>
#include <CoreFoundation/CFURL.h> #include <CoreFoundation/CFURL.h>
#include <mach-o/dyld.h> #include <mach-o/dyld.h>