diff --git a/CMakeLists.txt b/CMakeLists.txt index f02ee518e..653567851 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,11 +36,11 @@ # # For an iOS static library, use # -# cmake -D IOS_PLATFORM=OS -G Xcode +# cmake -D IOS_PLATFORM=OS -G Xcode # # or # -# cmake -D IOS_PLATFORM=SIMULATOR -G Xcode +# cmake -D IOS_PLATFORM=SIMULATOR -G Xcode # # Please refer to the cmake manual for further options, in particular, how # to modify compilation and linking parameters. @@ -102,7 +102,7 @@ if (APPLE) 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) diff --git a/ChangeLog b/ChangeLog index 5eb6defda..6dd1f0c73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-03-11 Pavlo Denysov + + 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 [truetype] Fix handling of non-intermediate GX tuples. diff --git a/builds/cmake/iOS.cmake b/builds/cmake/iOS.cmake index 9fb20c093..378dbd895 100644 --- a/builds/cmake/iOS.cmake +++ b/builds/cmake/iOS.cmake @@ -85,11 +85,6 @@ if (CMAKE_UNAME) 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)