forked from minhngoc25a/freetype2
Fix CMake issues for iOS (patch #8941).
* CMakeLists.txt (CMAKE_TOOLCHAIN_FILE): Fix directory. * builds/cmake/iOS.cmake: No longer enforce gcc.
This commit is contained in:
parent
74c0a72d52
commit
10265db114
|
@ -36,11 +36,11 @@
|
||||||
#
|
#
|
||||||
# For an iOS static library, use
|
# For an iOS static library, use
|
||||||
#
|
#
|
||||||
# cmake <path-to-freetype2-src-dir> -D IOS_PLATFORM=OS -G Xcode
|
# cmake -D IOS_PLATFORM=OS -G Xcode <path-to-freetype2-src-dir>
|
||||||
#
|
#
|
||||||
# or
|
# or
|
||||||
#
|
#
|
||||||
# cmake <path-to-freetype2-src-dir> -D IOS_PLATFORM=SIMULATOR -G Xcode
|
# cmake -D IOS_PLATFORM=SIMULATOR -G Xcode <path-to-freetype2-src-dir>
|
||||||
#
|
#
|
||||||
# Please refer to the cmake manual for further options, in particular, how
|
# Please refer to the cmake manual for further options, in particular, how
|
||||||
# to modify compilation and linking parameters.
|
# to modify compilation and linking parameters.
|
||||||
|
@ -102,7 +102,7 @@ if (APPLE)
|
||||||
set(BUILD_SHARED_LIBS OFF)
|
set(BUILD_SHARED_LIBS OFF)
|
||||||
|
|
||||||
set(CMAKE_TOOLCHAIN_FILE
|
set(CMAKE_TOOLCHAIN_FILE
|
||||||
${PROJECT_SOURCE_DIR}/builds/cmake/iOS.cmake)
|
${CMAKE_SOURCE_DIR}/builds/cmake/iOS.cmake)
|
||||||
endif ()
|
endif ()
|
||||||
else ()
|
else ()
|
||||||
if (DEFINED IOS_PLATFORM)
|
if (DEFINED IOS_PLATFORM)
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
2016-03-11 Pavlo Denysov <paul.kiev+savannah@gmail.com>
|
||||||
|
|
||||||
|
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 <behdad@behdad.org>
|
2016-03-09 Behdad Esfahbod <behdad@behdad.org>
|
||||||
|
|
||||||
[truetype] Fix handling of non-intermediate GX tuples.
|
[truetype] Fix handling of non-intermediate GX tuples.
|
||||||
|
|
|
@ -85,11 +85,6 @@ if (CMAKE_UNAME)
|
||||||
DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION}")
|
DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION}")
|
||||||
endif (CMAKE_UNAME)
|
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
|
# skip the platform compiler checks for cross compiling
|
||||||
set(CMAKE_CXX_COMPILER_WORKS TRUE)
|
set(CMAKE_CXX_COMPILER_WORKS TRUE)
|
||||||
set(CMAKE_C_COMPILER_WORKS TRUE)
|
set(CMAKE_C_COMPILER_WORKS TRUE)
|
||||||
|
|
Loading…
Reference in New Issue