From bfbde7926f2c1f6b4da058ed4cd0e91c6697096c Mon Sep 17 00:00:00 2001 From: Nikolaus Waxweiler Date: Sun, 10 Jun 2018 13:19:31 +0100 Subject: [PATCH] CMakeLists: also accept IOS_PLATFORM=SIMULATOR64 This might be needed to build FreeType for the iOS simulator. See https://savannah.nongnu.org/bugs/index.php?54048. Patch contributed by Steve Robinson. * CMakeLists.txt: Accept IOS_PLATFORM=SIMULATOR64 --- CMakeLists.txt | 9 +++++++-- ChangeLog | 10 ++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cfba113d1..f54e68871 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,10 @@ # # cmake -E chdir build cmake -G Xcode -D IOS_PLATFORM=SIMULATOR .. # +# or +# +# cmake -E chdir build cmake -G Xcode -D IOS_PLATFORM=SIMULATOR64 .. +# # Finally, build the project with: # # cmake --build build @@ -96,9 +100,10 @@ include(CheckIncludeFile) if (APPLE) if (DEFINED IOS_PLATFORM) if (NOT "${IOS_PLATFORM}" STREQUAL "OS" - AND NOT "${IOS_PLATFORM}" STREQUAL "SIMULATOR") + AND NOT "${IOS_PLATFORM}" STREQUAL "SIMULATOR" + AND NOT "${IOS_PLATFORM}" STREQUAL "SIMULATOR64") message(FATAL_ERROR - "IOS_PLATFORM must be set to either OS or SIMULATOR") + "IOS_PLATFORM must be set to either OS, SIMULATOR, or SIMULATOR64") endif () if (NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode") message(AUTHOR_WARNING diff --git a/ChangeLog b/ChangeLog index eadba3971..b7864d27f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2018-06-10 Nikolaus Waxweiler + + CMakeLists: also accept IOS_PLATFORM=SIMULATOR64 + + This might be needed to build FreeType for the iOS simulator. See + https://savannah.nongnu.org/bugs/index.php?54048. Patch contributed + by Steve Robinson. + + * CMakeLists.txt: Accept IOS_PLATFORM=SIMULATOR64 + 2018-06-10 Werner Lemberg Implement `FT_Palette_Get'.