[Firebird-checkins] SF.net SVN: firebird:[61014] firebird/trunk

[<ego...@us...>]

Revision: 61014
          http://sourceforge.net/p/firebird/code/61014
Author:   egorpugin
Date:     2015-03-19 11:34:04 +0000 (Thu, 19 Mar 2015)
Log Message:
-----------
[build] [cmake] Add some iOS ifdefs. Hide wrong include dir during crosscompiling.

Modified Paths:
--------------
    firebird/trunk/CMakeLists.txt
    firebird/trunk/builds/cmake/Configure.cmake
    firebird/trunk/src/isql/InputDevices.cpp
    firebird/trunk/src/yvalve/config/os/darwin/config_root.cpp

Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt	2015-03-19 07:09:49 UTC (rev 61013)
+++ firebird/trunk/CMakeLists.txt	2015-03-19 11:34:04 UTC (rev 61014)
@@ -228,8 +228,8 @@
 if (APPLE)
     set(OS_DIR darwin)
 
-    include_directories(/opt/local/include)
     if (NOT CMAKE_CROSSCOMPILING)
+        include_directories(/opt/local/include)
         link_directories(/opt/local/lib)
     endif()
 

Modified: firebird/trunk/builds/cmake/Configure.cmake
===================================================================
--- firebird/trunk/builds/cmake/Configure.cmake	2015-03-19 07:09:49 UTC (rev 61013)
+++ firebird/trunk/builds/cmake/Configure.cmake	2015-03-19 11:34:04 UTC (rev 61014)
@@ -66,7 +66,7 @@
 endif()
 
 if (IOS)
-    set(CMAKE_SYSTEM_PROCESSOR "arm") # armv7 ?
+    set(CMAKE_SYSTEM_PROCESSOR "armv7")
     add_definitions(-D__arm__)
 endif()
 

Modified: firebird/trunk/src/isql/InputDevices.cpp
===================================================================
--- firebird/trunk/src/isql/InputDevices.cpp	2015-03-19 07:09:49 UTC (rev 61013)
+++ firebird/trunk/src/isql/InputDevices.cpp	2015-03-19 11:34:04 UTC (rev 61014)
@@ -22,7 +22,7 @@
  */
 
 #include "firebird.h"
-#ifdef DARWIN
+#if defined(DARWIN) && !defined(IOS)
 #if defined(i386) || defined(__x86_64__)
 #include <architecture/i386/io.h>
 #else

Modified: firebird/trunk/src/yvalve/config/os/darwin/config_root.cpp
===================================================================
--- firebird/trunk/src/yvalve/config/os/darwin/config_root.cpp	2015-03-19 07:09:49 UTC (rev 61013)
+++ firebird/trunk/src/yvalve/config/os/darwin/config_root.cpp	2015-03-19 11:34:04 UTC (rev 61014)
@@ -37,7 +37,9 @@
 #include "../common/os/path_utils.h"
 #include "../common/file_params.h"
 
+#ifndef IOS
 #include <CoreServices/CoreServices.h>
+#endif
 #include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFURL.h>
 #include <mach-o/dyld.h>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.