Unbreak CMake Windows installation

* CMakeLists.txt: Generate ftconfig.h on non-UNIX.
7 years ago · 660afb5ce8
parent 9514959241
commit 660afb5ce8
2 changed files with 12 additions and 2 deletions
--- 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
--- a/7
+++ b/7
@ -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.