From fc1b7896f65257c6883854aab3fc7fdd7ee99534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Thu, 1 Nov 2012 17:31:34 -0400 Subject: [PATCH] cmake: build for iOS --- client/CMakeLists.txt | 4 ++-- cmake/iOSToolchain.cmake | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 84ba2e2ee..401d8f642 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -32,14 +32,14 @@ else() endif() endif() -if(NOT WIN32 AND (NOT ANDROID)) +if((NOT WIN32) AND (NOT ANDROID) AND (NOT IOS)) find_suggested_package(X11) if(WITH_X11) add_subdirectory(X11) endif() endif() -if(APPLE) +if(APPLE AND (NOT IOS)) add_subdirectory(Mac) endif() diff --git a/cmake/iOSToolchain.cmake b/cmake/iOSToolchain.cmake index 469e83acf..2c68dc2c0 100644 --- a/cmake/iOSToolchain.cmake +++ b/cmake/iOSToolchain.cmake @@ -10,7 +10,7 @@ # SIMULATOR - used to build for the Simulator platforms, which have an x86 arch. # # CMAKE_IOS_DEVELOPER_ROOT = automatic(default) or /path/to/platform/Developer folder -# By default this location is automatcially chosen based on the IOS_PLATFORM value above. +# By default this location is automatically chosen based on the IOS_PLATFORM value above. # If set manually, it will override the default location and force the user of a particular Developer Platform # # CMAKE_IOS_SDK_ROOT = automatic(default) or /path/to/platform/Developer/SDKs/SDK folder @@ -36,6 +36,10 @@ set (UNIX True) set (APPLE True) set (IOS True) +# Workaround for FindThreads.cmake +set(Threads_FOUND TRUE) +set(CMAKE_THREAD_LIBS_INIT "-pthread") + # Determine the cmake host system version so we know where to find the iOS SDKs find_program (CMAKE_UNAME uname /bin /usr/bin /usr/local/bin) if (CMAKE_UNAME) @@ -121,7 +125,7 @@ if (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT) endif (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT) set (CMAKE_IOS_DEVELOPER_ROOT ${CMAKE_IOS_DEVELOPER_ROOT} CACHE PATH "Location of iOS Platform") -# Find and use the most recent iOS sdk unless specified manually with CMAKE_IOS_SDK_ROOT +# Find and use the most recent iOS SDK unless specified manually with CMAKE_IOS_SDK_ROOT if (NOT DEFINED CMAKE_IOS_SDK_ROOT) file (GLOB _CMAKE_IOS_SDKS "${CMAKE_IOS_DEVELOPER_ROOT}/SDKs/*") if (_CMAKE_IOS_SDKS) @@ -129,9 +133,9 @@ if (NOT DEFINED CMAKE_IOS_SDK_ROOT) list (REVERSE _CMAKE_IOS_SDKS) list (GET _CMAKE_IOS_SDKS 0 CMAKE_IOS_SDK_ROOT) else (_CMAKE_IOS_SDKS) - message (FATAL_ERROR "No iOS SDK's found in default seach path ${CMAKE_IOS_DEVELOPER_ROOT}. Manually set CMAKE_IOS_SDK_ROOT or install the iOS SDK.") + message (FATAL_ERROR "No iOS SDK's found in default search path ${CMAKE_IOS_DEVELOPER_ROOT}. Manually set CMAKE_IOS_SDK_ROOT or install the iOS SDK.") endif (_CMAKE_IOS_SDKS) - message (STATUS "Toolchain using default iOS SDK: ${CMAKE_IOS_SDK_ROOT}") + message (STATUS "iOS SDK root: ${CMAKE_IOS_SDK_ROOT}") endif (NOT DEFINED CMAKE_IOS_SDK_ROOT) set (CMAKE_IOS_SDK_ROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Location of the selected iOS SDK") @@ -148,6 +152,9 @@ endif (${IOS_PLATFORM} STREQUAL "OS") set (CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE string "Build architecture for iOS") +set (CMAKE_PREFIX_PATH "${CMAKE_IOS_SDK_ROOT}/usr") +set (CMAKE_REQUIRED_INCLUDES "${CMAKE_IOS_SDK_ROOT}/usr/include") + # Set the find root to the iOS developer roots and to user defined paths set (CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_IOS_SDK_ROOT} ${CMAKE_PREFIX_PATH} CACHE string "iOS find search path root") @@ -158,15 +165,13 @@ set (CMAKE_FIND_FRAMEWORK FIRST) set (CMAKE_SYSTEM_FRAMEWORK_PATH ${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks ${CMAKE_IOS_SDK_ROOT}/System/Library/PrivateFrameworks - ${CMAKE_IOS_SDK_ROOT}/Developer/Library/Frameworks -) + ${CMAKE_IOS_SDK_ROOT}/Developer/Library/Frameworks) # only search the iOS sdks, not the remainder of the host filesystem set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - # This little macro lets you set any XCode specific property macro (set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE) set_property (TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE})