[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 660afb5: Unbreak CMake Windows installation
From: |
Nikolaus Waxweiler |
Subject: |
[freetype2] master 660afb5: Unbreak CMake Windows installation |
Date: |
Wed, 2 May 2018 18:40:20 -0400 (EDT) |
branch: master
commit 660afb5ce81ccf3271ec80b6475ec8b16d862a25
Author: Nikolaus Waxweiler <address@hidden>
Commit: Nikolaus Waxweiler <address@hidden>
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 ad8ded0..6f3fef7 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 276d3f5..9fb0711 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-05-02 Nikolaus Waxweiler <address@hidden>
+
+ Unbreak CMake Windows installation
+
+ * CMakeLists.txt: Generate ftconfig.h on non-UNIX.
+
+
2018-05-02 Werner Lemberg <address@hidden>
Remove FT_CONFIG_OPTION_PIC and related code.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 660afb5: Unbreak CMake Windows installation,
Nikolaus Waxweiler <=