summaryrefslogtreecommitdiff
path: root/navit/font
diff options
context:
space:
mode:
authorrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-05-02 20:07:10 +0000
committerrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-05-02 20:07:10 +0000
commit9f6311fe1ded1d71ac2090618012db07af309de3 (patch)
tree522227cf7f40ae0f5095a339613eeb2a6a0beca9 /navit/font
parenta9c4ccc24ec2a981b9bcc30b99c31face858c268 (diff)
downloadnavit-svn-9f6311fe1ded1d71ac2090618012db07af309de3.tar.gz
Fix:build/cmake:Added building of garmin plugin and some fixes to use same install path as autotools build. thanks pini
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4465 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/font')
-rw-r--r--navit/font/freetype/CMakeLists.txt18
1 files changed, 17 insertions, 1 deletions
diff --git a/navit/font/freetype/CMakeLists.txt b/navit/font/freetype/CMakeLists.txt
index 37018741..0c06ee9d 100644
--- a/navit/font/freetype/CMakeLists.txt
+++ b/navit/font/freetype/CMakeLists.txt
@@ -1,2 +1,18 @@
-module_add_library(font_freetype font_freetype.c)
+module_add_library(font_freetype font_freetype.c)
+if (FRIBIDI_FOUND)
+ set_property(
+ TARGET font_freetype
+ APPEND PROPERTY COMPILE_DEFINITIONS USE_FRIBIDI=1
+ )
+ set_property(
+ TARGET font_freetype
+ APPEND PROPERTY COMPILE_FLAGS "-I${FRIBIDI_INCLUDE_DIRS}"
+ )
+ if (NOT FRIBIDI2_FOUND)
+ set_property(
+ TARGET font_freetype
+ APPEND PROPERTY COMPILE_DEFINITIONS FRIBIDIOLD=1
+ )
+ endif (NOT FRIBIDI2_FOUND)
+endif (FRIBIDI_FOUND)