ref: 10265db1148d65a747f39942e5c89cc859f1638e
parent: 74c0a72d529ab1622e055aeb59bc7dde2824b8f2
author: Werner Lemberg <[email protected]>
date: Fri Mar 11 01:50:23 EST 2016
Fix CMake issues for iOS (patch #8941). * CMakeLists.txt (CMAKE_TOOLCHAIN_FILE): Fix directory. * builds/cmake/iOS.cmake: No longer enforce gcc.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,11 +36,11 @@
#
# For an iOS static library, use
#
-# cmake <path-to-freetype2-src-dir> -D IOS_PLATFORM=OS -G Xcode
+# cmake -D IOS_PLATFORM=OS -G Xcode <path-to-freetype2-src-dir>
#
# or
#
-# cmake <path-to-freetype2-src-dir> -D IOS_PLATFORM=SIMULATOR -G Xcode
+# cmake -D IOS_PLATFORM=SIMULATOR -G Xcode <path-to-freetype2-src-dir>
#
# Please refer to the cmake manual for further options, in particular, how
# to modify compilation and linking parameters.
@@ -102,7 +102,7 @@
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_TOOLCHAIN_FILE
- ${PROJECT_SOURCE_DIR}/builds/cmake/iOS.cmake)+ ${CMAKE_SOURCE_DIR}/builds/cmake/iOS.cmake)endif ()
else ()
if (DEFINED IOS_PLATFORM)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-03-11 Pavlo Denysov <[email protected]>
+
+ Fix CMake issues for iOS (patch #8941).
+
+ * CMakeLists.txt (CMAKE_TOOLCHAIN_FILE): Fix directory.
+ * builds/cmake/iOS.cmake: No longer enforce gcc.
+
2016-03-09 Behdad Esfahbod <[email protected]>
[truetype] Fix handling of non-intermediate GX tuples.
--- a/builds/cmake/iOS.cmake
+++ b/builds/cmake/iOS.cmake
@@ -85,11 +85,6 @@
DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION}")endif (CMAKE_UNAME)
-# force the compilers to gcc for iOS
-include(CMakeForceCompiler)
-CMAKE_FORCE_C_COMPILER(gcc gcc)
-CMAKE_FORCE_CXX_COMPILER(g++ g++)
-
# skip the platform compiler checks for cross compiling
set(CMAKE_CXX_COMPILER_WORKS TRUE)
set(CMAKE_C_COMPILER_WORKS TRUE)