From 363273b1e82d41a27889cbfe196f75de8adb83c6 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Mon, 17 Sep 2012 13:33:42 +0800 Subject: [PATCH] include config.h for fontforge >= 2.0.0 --- CMakeLists.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36a1ca8..f96c13e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,14 +43,6 @@ else() message(FATAL_ERROR "Error: cannot locate fontforge.h") endif() - find_path(FF_CONFIG_INCLUDE_PATH config.h PATHS ${FONTFORGE_INCLUDE_DIRS}) - if(FF_CONFIG_INCLUDE_PATH) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include ${FF_CONFIG_INCLUDE_PATH}/config.h") - message("Found config.h: ${FF_CONFIG_INCLUDE_PATH}/config.h") - else() - message("Cannot locate config.h for fontforge") - endif() - macro(wl_find_library LIB_NAME RESULT) unset(${RESULT}) unset(${RESULT} CACHE) @@ -87,6 +79,15 @@ else() set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${PYTHON_LIBRARIES}) endif() +find_path(FF_CONFIG_INCLUDE_PATH config.h PATHS ${FONTFORGE_INCLUDE_DIRS}) +if(FF_CONFIG_INCLUDE_PATH) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include ${FF_CONFIG_INCLUDE_PATH}/config.h") +message("Found config.h: ${FF_CONFIG_INCLUDE_PATH}/config.h") +else() +message("Cannot locate config.h for fontforge") +endif() + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wunused-function") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb")