[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master fdc6f44: CMakeLists: also accept IOS_PLATFORM=SIMULAT
From: |
Nikolaus Waxweiler |
Subject: |
[freetype2] master fdc6f44: CMakeLists: also accept IOS_PLATFORM=SIMULATOR64 |
Date: |
Sun, 10 Jun 2018 08:23:26 -0400 (EDT) |
branch: master
commit fdc6f449e2fa7e41400363ccf1f412098d6bbb82
Author: Nikolaus Waxweiler <address@hidden>
Commit: Nikolaus Waxweiler <address@hidden>
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.
* CMakeLists.txt: Accept IOS_PLATFORM=SIMULATOR64
---
CMakeLists.txt | 9 +++++++--
ChangeLog | 9 +++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfba113..f54e688 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 eadba39..ae834d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-06-10 Nikolaus Waxweiler <address@hidden>
+
+ 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.
+
+ * CMakeLists.txt: Accept IOS_PLATFORM=SIMULATOR64
+
2018-06-10 Werner Lemberg <address@hidden>
Implement `FT_Palette_Get'.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master fdc6f44: CMakeLists: also accept IOS_PLATFORM=SIMULATOR64,
Nikolaus Waxweiler <=