etch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vei...@apache.org
Subject svn commit: r1580796 - in /etch/trunk/binding-cpp/runtime: ./ src/test/ toolchains/
Date Mon, 24 Mar 2014 09:52:15 GMT
Author: veithm
Date: Mon Mar 24 09:52:14 2014
New Revision: 1580796

URL: http://svn.apache.org/r1580796
Log:
ETCH-279 Adding support for iOS platforms

This patch adds support for iOS on the following architectures:
ARMv7, ARMv7S, ARM64, iPhoneSimulator 32 Bit, iPhoneSimulator 64 Bit

Test execution is only possible on the iPhone simulator.

Change-Id: I2e668df2e8829e94e20f298a8690f146996d263c

Added:
    etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARM64.toolchain
    etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARMV7S_32.toolchain   (with props)
    etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARMV7_32.toolchain   (with props)
    etch/trunk/binding-cpp/runtime/toolchains/iPhoneSimulatorOS_X86_32.toolchain   (with props)
    etch/trunk/binding-cpp/runtime/toolchains/iPhoneSimulatorOS_X86_64.toolchain
Modified:
    etch/trunk/binding-cpp/runtime/build.properties
    etch/trunk/binding-cpp/runtime/build.xml
    etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt

Modified: etch/trunk/binding-cpp/runtime/build.properties
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/build.properties?rev=1580796&r1=1580795&r2=1580796&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/build.properties (original)
+++ etch/trunk/binding-cpp/runtime/build.properties Mon Mar 24 09:52:14 2014
@@ -21,11 +21,29 @@
 # Add Properties with:
 # target.platforms.XXXX.generator=Unix Makefiles / Visual Studio 8 2005 / XCode - See CMake
documentation for possible Generators
 # target.platforms.XXXX.buildTests=YES / NO
+# target.platforms.XXXX.writeTestResultsToFile=YES / NO - Some Platforms are not allowed
/ able to write to the file System - Disable with this property
 #
 # If you want to use a local Capu Source Dir:
 #
 # LOCAL_CAPU_SOURCE_DIR=/Path/To/Your/Local/capu/Dir
 #
+# ===============================================================================================
+# -----------------
+# Defaults:
+# -----------------
+# Tests have to be disabled for: iPhoneOS_ARMV7_32, iPhoneOS_ARMV7S_32, iPhoneOS_ARM64
+#
+target.platforms.iPhoneOS_ARMV7_32.buildTests=NO
+target.platforms.iPhoneOS_ARMV7S_32.buildTests=NO
+target.platforms.iPhoneOS_ARM64.buildTests=NO
+#
+# Writing Test-Results to the File System have to be disabled for: iPhoneSimulatorOS_X86_32,
iPhoneSimulatorOS_X86_64
+#
+target.platforms.iPhoneSimulatorOS_X86_32.writeTestResultsToFile=NO
+target.platforms.iPhoneSimulatorOS_X86_64.writeTestResultsToFile=NO
+#
+# ===============================================================================================
+#
 # -----------------
 # Example:
 # -----------------
@@ -34,4 +52,4 @@
 # target.platforms.Windows_X86_32.generator=Visual Studio 8 2005
 # target.platforms.QNX_X86_32.generator=Unix Makefiles
 # target.platforms.QNX_X86_32.buildTests=NO
-#
\ No newline at end of file
+#

Modified: etch/trunk/binding-cpp/runtime/build.xml
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/build.xml?rev=1580796&r1=1580795&r2=1580796&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/build.xml (original)
+++ etch/trunk/binding-cpp/runtime/build.xml Mon Mar 24 09:52:14 2014
@@ -87,6 +87,7 @@
             <sequential>
                 <var name="platform" value="@{platform}"/>
                 <var name="cmake.build.etchtests" unset="true"/>
+                <var name="etchtests.writeTestResultsToFile" unset="true"/>
                 <if>
                     <isset property="target.platforms.${platform}.buildTests" />
                         <then>
@@ -96,12 +97,30 @@
                             <property name="cmake.build.etchtests" value="YES" />
                         </else>
                 </if>
+                <if>
+                    <isset property="target.platforms.${platform}.writeTestResultsToFile"
/>
+                        <then>
+                            <propertycopy name="etchtests.writeTestResultsToFile" from="target.platforms.${platform}.writeTestResultsToFile"
/>
+                        </then>
+                        <else>
+                            <property name="etchtests.writeTestResultsToFile" value="YES"
/>
+                        </else>
+                </if>
                 <echo>Init platform: ${platform}</echo>
                 <antcall target="init"/>
                 <echo>Building platform: ${platform}</echo>
                 <antcall target="do-build"/>
                 <echo>Testing platform: ${platform}</echo>
-                <antcall target="do-test"/>
+                <if>
+                    <equals arg1="${etchtests.writeTestResultsToFile}" arg2="YES"/>
+                    <then>
+                        <antcall target="do-test"/>
+                    </then>
+                    <else>
+                        <antcall target="do-test-noTestResults"/>
+                    </else>
+                </if>
+
             </sequential>
         </for>
 
@@ -178,6 +197,16 @@
         </if>
 
         <if>
+            <isset property="ios.sdkVersion" />
+                <then>
+                    <propertycopy name="cmake.ios.sdkVersion" from="ios.sdkVersion" />
+                </then>
+                <else>
+                    <property name="cmake.ios.sdkVersion" value="7.1" />
+                </else>
+        </if>
+
+        <if>
             <isset property="target.platforms.${platform}.generator"/>
             <then>
                 <!-- use specified generator -->
@@ -199,6 +228,7 @@
                     <arg value="-DCAPU_INCLUDE_DIR:PATH=${use.capu.include.dir}"/>
                     <arg value="-DCAPU_LIBRARY_DIR:PATH=${use.capu.library.dir}"/>
                     <arg value="-DCAPU_BUILD_DIR:PATH=${capu3rd}" />
+                    <arg value="-DSDK_VERSION:STRING=${cmake.ios.sdkVersion}" />
                     <arg value="-DLOCAL_CAPU_SOURCE_DIR:PATH=${use.capu.local.source.dir}"/>
                     <arg value="-DCONFIG_BUILD_TESTS:BOOL=${cmake.build.etchtests}" />
                     <arg value="${basedir}"/>
@@ -234,6 +264,7 @@
                     <arg value="-DCAPU_LIBRARY_DIR:PATH=${use.capu.library.dir}"/>
                     <arg value="-DLOCAL_CAPU_SOURCE_DIR:PATH=${use.capu.local.source.dir}"/>
                     <arg value="-DCAPU_BUILD_DIR:PATH=${capu3rd}" />
+                    <arg value="-DSDK_VERSION:STRING=${cmake.ios.sdkVersion}" />
                     <arg value="-DCONFIG_BUILD_TESTS:BOOL=${cmake.build.etchtests}" />
                     <arg value="${basedir}"/>
                 </exec>
@@ -278,6 +309,22 @@
         </if>
     </target>
 
+    <target name="do-test-noTestResults" unless="skip.tests">
+         <if>
+            <not><equals arg1="${cmake.build.etchtests}" arg2="YES"/></not>
+            <then>
+                <echo>Test execution has been disabled.</echo>
+            </then>
+            <else>
+                <!-- Run Etch Unit Tests -->
+                <!-- Run Etch Unit Tests on Windows-->
+                <exec executable="${binaryDir}/${platform}/${Etch.build.target}/etch-cpp-test.exe"
osfamily="windows"  failonerror="true" />
+                <!-- Run Etch Unit Tests on Unix -->
+                <exec executable="${binaryDir}/${platform}/${Etch.build.target}/etch-cpp-test"
osfamily="unix"  failonerror="true" />
+            </else>
+        </if>
+    </target>
+
     <target name="do-publish" if="build.tests.fail">
         <!-- Set flag file if any tests failed -->
         <touch file="${Etch.runtime.tests.fail}"/>

Modified: etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt?rev=1580796&r1=1580795&r2=1580796&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt (original)
+++ etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt Mon Mar 24 09:52:14 2014
@@ -112,6 +112,8 @@ ELSEIF(TARGET_OS STREQUAL "QNX")
   target_link_libraries (etch-cpp-test etch-cpp capu c socket)
 ELSEIF(TARGET_OS STREQUAL "MacOSX")
   target_link_libraries (etch-cpp-test etch-cpp capu)
+ELSEIF(TARGET_OS STREQUAL "iPhoneSimulatorOS")
+  target_link_libraries (etch-cpp-test etch-cpp capu)
 ENDIF()
 
 IF (TARGET_OS STREQUAL "Windows" AND BUILD_CHECK_MEMORY)

Added: etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARM64.toolchain
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARM64.toolchain?rev=1580796&view=auto
==============================================================================
--- etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARM64.toolchain (added)
+++ etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARM64.toolchain Mon Mar 24 09:52:14
2014
@@ -0,0 +1,55 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more 
+# contributor license agreements. See the NOTICE file distributed with  
+# this work for additional information regarding copyright ownership. 
+# The ASF licenses this file to you under the Apache License, Version  
+# 2.0 (the "License"); you may not use this file except in compliance  
+# with the License. You may obtain a copy of the License at 
+# 
+# http://www.apache.org/licenses/LICENSE-2.0 
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and 
+# limitations under the License. 
+#
+
+SET (TARGET_OS iPhoneOS)
+SET (TARGET_ARCH ARM64)
+
+INCLUDE(CMakeForceCompiler)
+CMAKE_FORCE_C_COMPILER(clang clang)
+CMAKE_FORCE_CXX_COMPILER(clang++ clang)
+
+SET (CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
+
+IF(NOT SDK_VERSION)
+	SET (SDK_VERSION "7.1" CACHE STRING "iOS SDK-Version" FORCE)
+	MESSAGE(STATUS "   WARNING: The SDK_VERSION was set to default to ${SDK_VERSION}, you can
specify an other SDK by using \"-DSDK_VERSION=7.1\" or by using the CMake GUI")
+ELSE()
+	SET (SDK_VERSION "${SDK_VERSION}" CACHE STRING "iOS SDK-Version" FORCE)
+ENDIF()
+
+SET (DEVELOPER_ROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer"
CACHE STRING "Developer Root Path" FORCE)
+SET (SDK_ROOT "${DEVELOPER_ROOT}/SDKs/iPhoneOS${SDK_VERSION}.sdk" CACHE STRING "SDK Root
Path" FORCE)
+
+SET (CMAKE_OSX_SYSROOT "${SDK_ROOT}")
+SET (CMAKE_OSX_DEPLOYMENT_TARGET "")
+SET (CMAKE_OSX_ARCHITECTURES "arm64")
+
+SET (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
+
+SET (CMAKE_C_FLAGS_DEBUG "-ggdb -Wall -D_DEBUG")
+SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+
+SET (CMAKE_C_FLAGS_RELEASE "-Wall -O3 -DNDEBUG")
+SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+
+ADD_DEFINITIONS ("-DTARGET_OS=iPhoneOS")
+ADD_DEFINITIONS ("-DTARGET_ARCH=ARM64")
+ADD_DEFINITIONS ("-DOS_IPHONEOS")
+ADD_DEFINITIONS ("-DARCH_ARM64")
+
+#disable GTEST ARM Targets
+SET(CONFIG_BUILD_TESTS FALSE)

Added: etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARMV7S_32.toolchain
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARMV7S_32.toolchain?rev=1580796&view=auto
==============================================================================
--- etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARMV7S_32.toolchain (added)
+++ etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARMV7S_32.toolchain Mon Mar 24 09:52:14
2014
@@ -0,0 +1,55 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more 
+# contributor license agreements. See the NOTICE file distributed with  
+# this work for additional information regarding copyright ownership. 
+# The ASF licenses this file to you under the Apache License, Version  
+# 2.0 (the "License"); you may not use this file except in compliance  
+# with the License. You may obtain a copy of the License at 
+# 
+# http://www.apache.org/licenses/LICENSE-2.0 
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and 
+# limitations under the License. 
+#
+
+SET (TARGET_OS iPhoneOS)
+SET (TARGET_ARCH ARMV7S)
+
+INCLUDE(CMakeForceCompiler)
+CMAKE_FORCE_C_COMPILER(clang clang)
+CMAKE_FORCE_CXX_COMPILER(clang++ clang)
+
+SET (CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
+
+IF(NOT SDK_VERSION)
+	SET (SDK_VERSION "7.1" CACHE STRING "iOS SDK-Version" FORCE)
+	MESSAGE(STATUS "   WARNING: The SDK_VERSION was set to default to ${SDK_VERSION}, you can
specify an other SDK by using \"-DSDK_VERSION=7.1\" or by using the CMake GUI")
+ELSE()
+	SET (SDK_VERSION "${SDK_VERSION}" CACHE STRING "iOS SDK-Version" FORCE)
+ENDIF()
+
+SET (DEVELOPER_ROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer"
CACHE STRING "Developer Root Path" FORCE)
+SET (SDK_ROOT "${DEVELOPER_ROOT}/SDKs/iPhoneOS${SDK_VERSION}.sdk" CACHE STRING "SDK Root
Path" FORCE)
+
+SET (CMAKE_OSX_SYSROOT "${SDK_ROOT}")
+SET (CMAKE_OSX_DEPLOYMENT_TARGET "")
+SET (CMAKE_OSX_ARCHITECTURES "armv7s")
+
+SET (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
+
+SET (CMAKE_C_FLAGS_DEBUG "-ggdb -Wall -D_DEBUG")
+SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+
+SET (CMAKE_C_FLAGS_RELEASE "-Wall -O3 -DNDEBUG")
+SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+
+ADD_DEFINITIONS ("-DTARGET_OS=iPhoneOS")
+ADD_DEFINITIONS ("-DTARGET_ARCH=ARMV7S")
+ADD_DEFINITIONS ("-DOS_IPHONEOS")
+ADD_DEFINITIONS ("-DARCH_ARMV7")
+
+#disable GTEST ARM Targets
+SET(CONFIG_BUILD_TESTS FALSE)

Propchange: etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARMV7S_32.toolchain
------------------------------------------------------------------------------
    svn:executable = *

Added: etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARMV7_32.toolchain
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARMV7_32.toolchain?rev=1580796&view=auto
==============================================================================
--- etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARMV7_32.toolchain (added)
+++ etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARMV7_32.toolchain Mon Mar 24 09:52:14
2014
@@ -0,0 +1,55 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more 
+# contributor license agreements. See the NOTICE file distributed with  
+# this work for additional information regarding copyright ownership. 
+# The ASF licenses this file to you under the Apache License, Version  
+# 2.0 (the "License"); you may not use this file except in compliance  
+# with the License. You may obtain a copy of the License at 
+# 
+# http://www.apache.org/licenses/LICENSE-2.0 
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and 
+# limitations under the License. 
+#
+
+SET (TARGET_OS iPhoneOS)
+SET (TARGET_ARCH ARMV7)
+
+INCLUDE(CMakeForceCompiler)
+CMAKE_FORCE_C_COMPILER(clang clang)
+CMAKE_FORCE_CXX_COMPILER(clang++ clang)
+
+SET (CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
+
+IF(NOT SDK_VERSION)
+	SET (SDK_VERSION "7.1" CACHE STRING "iOS SDK-Version" FORCE)
+	MESSAGE(STATUS "   WARNING: The SDK_VERSION was set to default to ${SDK_VERSION}, you can
specify an other SDK by using \"-DSDK_VERSION=7.1\" or by using the CMake GUI")
+ELSE()
+	SET (SDK_VERSION "${SDK_VERSION}" CACHE STRING "iOS SDK-Version" FORCE)
+ENDIF()
+
+SET (DEVELOPER_ROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer"
CACHE STRING "Developer Root Path" FORCE)
+SET (SDK_ROOT "${DEVELOPER_ROOT}/SDKs/iPhoneOS${SDK_VERSION}.sdk" CACHE STRING "SDK Root
Path" FORCE)
+
+SET (CMAKE_OSX_SYSROOT "${SDK_ROOT}")
+SET (CMAKE_OSX_DEPLOYMENT_TARGET "")
+SET (CMAKE_OSX_ARCHITECTURES "armv7")
+
+SET (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
+
+SET (CMAKE_C_FLAGS_DEBUG "-ggdb -Wall -D_DEBUG")
+SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+
+SET (CMAKE_C_FLAGS_RELEASE "-Wall -O3 -DNDEBUG")
+SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+
+ADD_DEFINITIONS ("-DTARGET_OS=iPhoneOS")
+ADD_DEFINITIONS ("-DTARGET_ARCH=ARMV7")
+ADD_DEFINITIONS ("-DOS_IPHONEOS")
+ADD_DEFINITIONS ("-DARCH_ARMV7")
+
+#disable GTEST ARM Targets
+SET(CONFIG_BUILD_TESTS FALSE)

Propchange: etch/trunk/binding-cpp/runtime/toolchains/iPhoneOS_ARMV7_32.toolchain
------------------------------------------------------------------------------
    svn:executable = *

Added: etch/trunk/binding-cpp/runtime/toolchains/iPhoneSimulatorOS_X86_32.toolchain
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/toolchains/iPhoneSimulatorOS_X86_32.toolchain?rev=1580796&view=auto
==============================================================================
--- etch/trunk/binding-cpp/runtime/toolchains/iPhoneSimulatorOS_X86_32.toolchain (added)
+++ etch/trunk/binding-cpp/runtime/toolchains/iPhoneSimulatorOS_X86_32.toolchain Mon Mar 24
09:52:14 2014
@@ -0,0 +1,55 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more 
+# contributor license agreements. See the NOTICE file distributed with  
+# this work for additional information regarding copyright ownership. 
+# The ASF licenses this file to you under the Apache License, Version  
+# 2.0 (the "License"); you may not use this file except in compliance  
+# with the License. You may obtain a copy of the License at 
+# 
+# http://www.apache.org/licenses/LICENSE-2.0 
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and 
+# limitations under the License. 
+#
+
+SET (TARGET_OS iPhoneSimulatorOS)
+SET (TARGET_ARCH X86_32)
+
+INCLUDE(CMakeForceCompiler)
+CMAKE_FORCE_C_COMPILER(clang clang)
+CMAKE_FORCE_CXX_COMPILER(clang++ clang)
+
+SET (CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
+
+IF(NOT SDK_VERSION)
+	SET (SDK_VERSION "7.1" CACHE STRING "iOS SDK-Version" FORCE)
+	MESSAGE(STATUS "   WARNING: The SDK_VERSION was set to default to ${SDK_VERSION}, you can
specify an other SDK by using \"-DSDK_VERSION=7.1\" or by using the CMake GUI")
+ELSE()
+	SET (SDK_VERSION "${SDK_VERSION}" CACHE STRING "iOS SDK-Version" FORCE)
+ENDIF()
+
+SET (DEVELOPER_ROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer"
CACHE STRING "Developer Root Path" FORCE)
+SET (SDK_ROOT "${DEVELOPER_ROOT}/SDKs/iPhoneSimulator${SDK_VERSION}.sdk" CACHE STRING "SDK
Root Path" FORCE)
+
+SET (CMAKE_OSX_SYSROOT "${SDK_ROOT}")
+SET (CMAKE_OSX_DEPLOYMENT_TARGET "")
+SET (CMAKE_OSX_ARCHITECTURES "i386")
+
+SET (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
+
+SET (CMAKE_C_FLAGS_DEBUG "-miphoneos-version-min=6.1 -ggdb -Wall -D_DEBUG")
+SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+
+SET (CMAKE_C_FLAGS_RELEASE "-miphoneos-version-min=6.1 -Wall -O3 -DNDEBUG")
+SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+
+ADD_DEFINITIONS ("-DTARGET_OS=iPhoneSimulatorOS")
+ADD_DEFINITIONS ("-DTARGET_ARCH=X86_32")
+ADD_DEFINITIONS ("-DOS_IPHONESIMULATOROS")
+ADD_DEFINITIONS ("-DARCH_X86_32")
+
+#Use GTEST own tuple implementation for OSX
+ADD_DEFINITIONS ("-DGTEST_USE_OWN_TR1_TUPLE=1")

Propchange: etch/trunk/binding-cpp/runtime/toolchains/iPhoneSimulatorOS_X86_32.toolchain
------------------------------------------------------------------------------
    svn:executable = *

Added: etch/trunk/binding-cpp/runtime/toolchains/iPhoneSimulatorOS_X86_64.toolchain
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/toolchains/iPhoneSimulatorOS_X86_64.toolchain?rev=1580796&view=auto
==============================================================================
--- etch/trunk/binding-cpp/runtime/toolchains/iPhoneSimulatorOS_X86_64.toolchain (added)
+++ etch/trunk/binding-cpp/runtime/toolchains/iPhoneSimulatorOS_X86_64.toolchain Mon Mar 24
09:52:14 2014
@@ -0,0 +1,55 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more 
+# contributor license agreements. See the NOTICE file distributed with  
+# this work for additional information regarding copyright ownership. 
+# The ASF licenses this file to you under the Apache License, Version  
+# 2.0 (the "License"); you may not use this file except in compliance  
+# with the License. You may obtain a copy of the License at 
+# 
+# http://www.apache.org/licenses/LICENSE-2.0 
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and 
+# limitations under the License. 
+#
+
+SET (TARGET_OS iPhoneSimulatorOS)
+SET (TARGET_ARCH X86_64)
+
+INCLUDE(CMakeForceCompiler)
+CMAKE_FORCE_C_COMPILER(clang clang)
+CMAKE_FORCE_CXX_COMPILER(clang++ clang)
+
+SET (CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
+
+IF(NOT SDK_VERSION)
+	SET (SDK_VERSION "7.1" CACHE STRING "iOS SDK-Version" FORCE)
+	MESSAGE(STATUS "   WARNING: The SDK_VERSION was set to default to ${SDK_VERSION}, you can
specify an other SDK by using \"-DSDK_VERSION=7.1\" or by using the CMake GUI")
+ELSE()
+	SET (SDK_VERSION "${SDK_VERSION}" CACHE STRING "iOS SDK-Version" FORCE)
+ENDIF()
+
+SET (DEVELOPER_ROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer"
CACHE STRING "Developer Root Path" FORCE)
+SET (SDK_ROOT "${DEVELOPER_ROOT}/SDKs/iPhoneSimulator${SDK_VERSION}.sdk" CACHE STRING "SDK
Root Path" FORCE)
+
+SET (CMAKE_OSX_SYSROOT "${SDK_ROOT}")
+SET (CMAKE_OSX_DEPLOYMENT_TARGET "")
+SET (CMAKE_OSX_ARCHITECTURES "x86_64")
+
+SET (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
+
+SET (CMAKE_C_FLAGS_DEBUG "-miphoneos-version-min=6.1 -ggdb -Wall -D_DEBUG")
+SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+
+SET (CMAKE_C_FLAGS_RELEASE "-miphoneos-version-min=6.1 -Wall -O3 -DNDEBUG")
+SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+
+ADD_DEFINITIONS ("-DTARGET_OS=iPhoneSimulatorOS")
+ADD_DEFINITIONS ("-DTARGET_ARCH=X86_64")
+ADD_DEFINITIONS ("-DOS_IPHONESIMULATOROS")
+ADD_DEFINITIONS ("-DARCH_X86_64")
+
+#Use GTEST own tuple implementation for OSX
+ADD_DEFINITIONS ("-DGTEST_USE_OWN_TR1_TUPLE=1")



Mime
View raw message