diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2019-05-03 06:39:31 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2019-05-03 06:39:31 +0000 |
commit | 62f6586395e612102f14cfbf245d6b548a742bc2 (patch) | |
tree | d9977834ee380d9fc626694be3acdf0b810065f9 /Build/source/libs/freetype2/freetype-src/CMakeLists.txt | |
parent | 8c0da66823797139402fc59a01132e71b54e97e6 (diff) |
freetype-1.10.0
git-svn-id: svn://tug.org/texlive/trunk@50966 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/CMakeLists.txt')
-rw-r--r-- | Build/source/libs/freetype2/freetype-src/CMakeLists.txt | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/CMakeLists.txt b/Build/source/libs/freetype2/freetype-src/CMakeLists.txt index ad8ded0bbdb..28dc3b3f677 100644 --- a/Build/source/libs/freetype2/freetype-src/CMakeLists.txt +++ b/Build/source/libs/freetype2/freetype-src/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists.txt # -# Copyright 2013-2018 by +# Copyright (C) 2013-2019 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # Written originally by John Cary <cary@txcorp.com> @@ -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 @@ -129,8 +134,8 @@ endif () project(freetype C) set(VERSION_MAJOR "2") -set(VERSION_MINOR "9") -set(VERSION_PATCH "1") +set(VERSION_MINOR "10") +set(VERSION_PATCH "0") # SOVERSION scheme: CURRENT.AGE.REVISION # If there was an incompatible interface change: @@ -153,7 +158,7 @@ option(FT_WITH_HARFBUZZ "Improve auto-hinting of OpenType fonts." OFF) # Disallow in-source builds -if ("${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}") +if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") message(FATAL_ERROR "In-source builds are not permitted! Make a separate folder for" " building, e.g.,\n" @@ -229,9 +234,12 @@ if (UNIX) endif () string(REPLACE "/undef " "#undef " FTCONFIG_H "${FTCONFIG_H}") - file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h" - "${FTCONFIG_H}") +else() + file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftconfig.h" + FTCONFIG_H) endif () +file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h" + "${FTCONFIG_H}") # Create the options file @@ -345,6 +353,10 @@ target_compile_definitions( if (WIN32) target_compile_definitions( freetype PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS) + if (BUILD_SHARED_LIBS) + target_compile_definitions( + freetype PRIVATE DLL_EXPORT) + endif () endif () if (BUILD_SHARED_LIBS) @@ -353,17 +365,17 @@ if (BUILD_SHARED_LIBS) SOVERSION ${LIBRARY_SOVERSION}) endif () -target_include_directories( - freetype BEFORE # Pick up ftconfig.h and ftoption.h generated above. - PRIVATE "${PROJECT_BINARY_DIR}/include") - +# Pick up ftconfig.h and ftoption.h generated above, first. target_include_directories( freetype - PRIVATE "${PROJECT_SOURCE_DIR}/include") + PUBLIC + $<INSTALL_INTERFACE:include/freetype2> + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> + PRIVATE + ${CMAKE_CURRENT_BINARY_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/include) -target_include_directories( - freetype - PUBLIC $<INSTALL_INTERFACE:include/freetype2>) if (BUILD_FRAMEWORK) set_property(SOURCE ${PUBLIC_CONFIG_HEADERS} @@ -457,6 +469,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) EXPORT freetype-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} FRAMEWORK DESTINATION Library/Frameworks COMPONENT libraries) install( |