Merge branch 'development' of https://git01.codeplex.com/casablanca into test_timeout

Author: stgates

Build_iOS/CMakeLists.txt

@@ -8,6 +8,9 @@ set(TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ios-cmake/toolchain/iOS.cmake")
 set(SIM_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build.i386" CACHE INTERNAL "")
 set(SIM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Release" CACHE INTERNAL "")
 
+set(SIM64_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build.x86_64" CACHE INTERNAL "")
+set(SIM64_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Release" CACHE INTERNAL "")
+
 set(ARM_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build.arm" CACHE INTERNAL "")
 set(ARM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Release" CACHE INTERNAL "")
 add_test(NAME ios_runner
@@ -25,19 +28,28 @@ execute_process(WORKING_DIRECTORY ${SIM_BINARY_DIR}
     "${SIM_SOURCE_DIR}"
     )
 
+file(MAKE_DIRECTORY ${SIM64_BINARY_DIR})
+execute_process(WORKING_DIRECTORY ${SIM64_BINARY_DIR}
+  COMMAND ${CMAKE_COMMAND}
+    -GXcode
+    -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE}
+    -DIOS_PLATFORM=SIMULATOR64
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    "${SIM64_SOURCE_DIR}"
+)
+
 file(MAKE_DIRECTORY ${ARM_BINARY_DIR})
 execute_process(WORKING_DIRECTORY ${ARM_BINARY_DIR}
   COMMAND ${CMAKE_COMMAND}
     -GXcode
     -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE}
     -DIOS_PLATFORM=OS
-    "-DCMAKE_OSX_ARCHITECTURES=armv7s;armv7;arm64"
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     "${ARM_SOURCE_DIR}"
     )
 
 
-## Simulator version
+## Simulator i386 version
 add_custom_target(sim
   COMMAND ${CMAKE_COMMAND}
     --build ${SIM_BINARY_DIR}
@@ -46,6 +58,15 @@ add_custom_target(sim
   VERBATIM
 )
 
+## Simulator x86_64 version
+add_custom_target(sim64
+  COMMAND ${CMAKE_COMMAND}
+    --build ${SIM64_BINARY_DIR}
+    --config ${CMAKE_BUILD_TYPE}
+    COMMENT "Building for x86_64 (simulator)"
+VERBATIM
+)
+
 ## ARM version
 add_custom_target(arm
   COMMAND ${CMAKE_COMMAND}
@@ -61,11 +82,14 @@ add_custom_command(
   COMMAND lipo -create
     -output "${CMAKE_CURRENT_BINARY_DIR}/${LIB_CPPREST}"
     ${SIM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}
+    ${SIM64_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}
     ${ARM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}
   DEPENDS
     sim
+    sim64
     arm
     "${SIM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}"
+    "${SIM64_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}"
     "${ARM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}"
   VERBATIM
 )