rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* CMakeLists.txt: Use cmake functions for generating `ftconfig.h'. 

Additionally, do this for UNIX only.
This commit is contained in:
Werner Lemberg 2015-06-25 16:38:11 +02:00
parent 5ef5a4fd8b
commit 68222dd122
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
CMakeLists.txt
View File

@ -115,17 +115,26 @@ add_definitions(-DFT2_BUILD_LIBRARY)
include_directories("${PROJECT_SOURCE_DIR}/include") include_directories("${PROJECT_SOURCE_DIR}/include")
# Create the configuration file # Create the configuration file
message(STATUS "Creating directory, ${PROJECT_BINARY_DIR}/include/freetype/config.") if (UNIX)
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/freetype/config) message(STATUS
"Creating directory ${PROJECT_BINARY_DIR}/include/freetype/config")
file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/include/freetype/config")
# For the auto-generated ftconfig.h file include_directories(BEFORE "${PROJECT_BINARY_DIR}/include/freetype/config")
include_directories(BEFORE "${PROJECT_BINARY_DIR}/include/freetype/config") message(STATUS
message(STATUS "Creating ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h.") "Creating file ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h")
execute_process(
COMMAND sed -e "s/FT_CONFIG_OPTIONS_H/<ftoption.h>/" -e "s/FT_CONFIG_STANDARD_LIBRARY_H/<ftstdlib.h>/" -e "s?/undef ?#undef ?" file(READ "${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in"
INPUT_FILE ${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in FTCONFIG_H)
OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h string(REPLACE "FT_CONFIG_OPTIONS_H" "ftoption.h"
) FTCONFIG_H "${FTCONFIG_H}")
string(REPLACE "FT_CONFIG_STANDARD_LIBRARY_H" "ftstdlib.h"
FTCONFIG_H "${FTCONFIG_H}")
string(REPLACE "/undef " "#undef "
FTCONFIG_H "${FTCONFIG_H}")
file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h"
"${FTCONFIG_H}")
endif ()
file(GLOB PUBLIC_HEADERS "include/ft2build.h" "include/freetype/*.h") file(GLOB PUBLIC_HEADERS "include/ft2build.h" "include/freetype/*.h")
file(GLOB PUBLIC_CONFIG_HEADERS "include/freetype/config/*.h") file(GLOB PUBLIC_CONFIG_HEADERS "include/freetype/config/*.h")

5
ChangeLog
View File

@ -6,6 +6,11 @@
* src/bdf/bdflib.c (_bdf_parse_start): Simplify bpp parsing. * src/bdf/bdflib.c (_bdf_parse_start): Simplify bpp parsing.
2015-06-25 Werner Lemberg <wl@gnu.org>
* CMakeLists.txt: Use cmake functions for generating `ftconfig.h'.
Additionally, do this for UNIX only.
2015-06-25 Werner Lemberg <wl@gnu.org> 2015-06-25 Werner Lemberg <wl@gnu.org>
* CMakeLists.txt (BASE_SRCS): Use `ftbase.c' and `psnames.c'. * CMakeLists.txt (BASE_SRCS): Use `ftbase.c' and `psnames.c'.