ref: 660afb5ce81ccf3271ec80b6475ec8b16d862a25
parent: 9514959241dec9943a99cd1c8f0c214a5fbb0d91
author: Nikolaus Waxweiler <madigens@gmail.com>
date: Wed May 2 19:19:55 EDT 2018
Unbreak CMake Windows installation * CMakeLists.txt: Generate ftconfig.h on non-UNIX.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,9 +229,12 @@
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
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-05-02 Nikolaus Waxweiler <madigens@gmail.com>
+
+ Unbreak CMake Windows installation
+
+ * CMakeLists.txt: Generate ftconfig.h on non-UNIX.
+
+
2018-05-02 Werner Lemberg <wl@gnu.org>
Remove FT_CONFIG_OPTION_PIC and related code.
--
⑨