freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] cmakelists-updates 155e60e 3/6: CMakeLists.txt: use builds/u


From: Nikolaus Waxweiler
Subject: [freetype2] cmakelists-updates 155e60e 3/6: CMakeLists.txt: use builds/unix/ftsystem.c on Unixoids
Date: Thu, 11 Jul 2019 18:22:28 -0400 (EDT)

branch: cmakelists-updates
commit 155e60e3e882435280de3c0b425131aba9d188b1
Author: Nikolaus Waxweiler <address@hidden>
Commit: Nikolaus Waxweiler <address@hidden>

    CMakeLists.txt: use builds/unix/ftsystem.c on Unixoids
---
 CMakeLists.txt | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1efc99..6db44cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,7 +313,6 @@ set(BASE_SRCS
   src/base/ftpfr.c
   src/base/ftstroke.c
   src/base/ftsynth.c
-  src/base/ftsystem.c
   src/base/fttype1.c
   src/base/ftwinfnt.c
   src/bdf/bdf.c
@@ -337,6 +336,12 @@ set(BASE_SRCS
   src/winfonts/winfnt.c
 )
 
+if (UNIX)
+  list(APPEND BASE_SRCS "builds/unix/ftsystem.c")
+else ()
+  list(APPEND BASE_SRCS "src/base/ftsystem.c")
+endif ()
+
 if (WIN32)
   enable_language(RC)
   list(APPEND BASE_SRCS builds/windows/ftdebug.c
@@ -395,8 +400,11 @@ target_include_directories(
       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     PRIVATE
       ${CMAKE_CURRENT_BINARY_DIR}/include
-      ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
+      ${CMAKE_CURRENT_SOURCE_DIR}/include
+      
+      # Make <ftconfig.h> available for builds/unix/ftsystem.c.
+      ${CMAKE_CURRENT_BINARY_DIR}/include/freetype/config
+)
 
 if (BUILD_FRAMEWORK)
   set_property(SOURCE ${PUBLIC_CONFIG_HEADERS}



reply via email to

[Prev in Thread] Current Thread [Next in Thread]