From 660afb5ce81ccf3271ec80b6475ec8b16d862a25 Mon Sep 17 00:00:00 2001 From: Nikolaus Waxweiler Date: Wed, 2 May 2018 23:19:55 +0100 Subject: [PATCH] Unbreak CMake Windows installation * CMakeLists.txt: Generate ftconfig.h on non-UNIX. --- CMakeLists.txt | 7 +++++-- ChangeLog | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad8ded0bb..6f3fef7d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -229,9 +229,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 diff --git a/ChangeLog b/ChangeLog index 276d3f5b5..9fb07110f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-05-02 Nikolaus Waxweiler + + Unbreak CMake Windows installation + + * CMakeLists.txt: Generate ftconfig.h on non-UNIX. + + 2018-05-02 Werner Lemberg Remove FT_CONFIG_OPTION_PIC and related code.