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
This commit is contained in:
parent
6732f05593
commit
bfbde7926f
|
@ -35,6 +35,10 @@
|
||||||
#
|
#
|
||||||
# cmake -E chdir build cmake -G Xcode -D IOS_PLATFORM=SIMULATOR ..
|
# 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:
|
# Finally, build the project with:
|
||||||
#
|
#
|
||||||
# cmake --build build
|
# cmake --build build
|
||||||
|
@ -96,9 +100,10 @@ include(CheckIncludeFile)
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
if (DEFINED IOS_PLATFORM)
|
if (DEFINED IOS_PLATFORM)
|
||||||
if (NOT "${IOS_PLATFORM}" STREQUAL "OS"
|
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
|
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 ()
|
endif ()
|
||||||
if (NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")
|
if (NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")
|
||||||
message(AUTHOR_WARNING
|
message(AUTHOR_WARNING
|
||||||
|
|
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2018-06-10 Nikolaus Waxweiler <madigens@gmail.com>
|
||||||
|
|
||||||
|
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 <wl@gnu.org>
|
2018-06-10 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
Implement `FT_Palette_Get'.
|
Implement `FT_Palette_Get'.
|
||||||
|
|
Loading…
Reference in New Issue