ref: bfbde7926f2c1f6b4da058ed4cd0e91c6697096c
parent: 6732f05593930621081092c7e2c2ec8ec043cc2d
author: Nikolaus Waxweiler <[email protected]>
date: Sun Jun 10 09:19:31 EDT 2018
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
--- 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 @@
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
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-06-10 Nikolaus Waxweiler <[email protected]>
+
+ 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 <[email protected]>
Implement `FT_Palette_Get'.