From 6796855c1e40ed5a77b85832ca9ac14966c3549a Mon Sep 17 00:00:00 2001 From: Deepak Date: Mon, 10 Sep 2012 22:19:08 +0200 Subject: [PATCH 1/2] added support for LLVM and fixed ff compilation on MacOSX --- CMakeLists.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cdee45..d3c7cc7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,16 @@ if(FF_INCLUDE_PATH) message("Found fontforge.h: ${FF_INCLUDE_PATH}/fontforge/fontforge.h") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include ${FF_INCLUDE_PATH}/fontforge/config.h") include_directories(${FF_INCLUDE_PATH}/fontforge) + # MacOSX gettext is in /opt/local/include - strange + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + find_path(GETTEXT_INCLUDE_PATH libintl.h) + if(GETTEXT_INCLUDE_PATH) + include_directories(${GETTEXT_INCLUDE_PATH}) + else() + # disable i18n if there is no gettext + set(NO_GETTEXT "YesPlease") + endif() + endif() else() message(FATAL_ERROR "Error: cannot locate fontforge.h") endif() @@ -51,6 +61,10 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused-function") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x") +# clang compiler need c++11 flag +if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +endif() #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb") From f711a6ec255a5c90189c8174ea10f381d5105dc4 Mon Sep 17 00:00:00 2001 From: Deepak Date: Mon, 10 Sep 2012 22:27:19 +0200 Subject: [PATCH 2/2] removed unreqiured flag --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a91bab5..bdc482f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wunused-function") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused-function") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x") # clang compiler need c++11 flag if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")