diff options
| -rw-r--r-- | navit/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | navit/navit/fonts/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index da9b5442f..314fa2d63 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -172,7 +172,9 @@ if(FREETYPE_FOUND) pkg_check_modules(FRIBIDI2 fribidi>=0.19.0) include_directories(${FREETYPE_INCLUDE_DIRS}) set_with_reason(font/freetype "freetype found" TRUE "${FREETYPE_LIBRARY};${FONTCONFIG_LIBRARIES};${FRIBIDI_LIBRARIES}") - add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/navit/fonts") + if(NOT FONTCONFIG_FOUND) + add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/navit/fonts") + endif() else(FREETYPE_FOUND) MESSAGE("No freetype library found, graphics modules may not be available") set_with_reason(graphics/android "FreeType library not found" FALSE) diff --git a/navit/navit/fonts/CMakeLists.txt b/navit/navit/fonts/CMakeLists.txt index bf50e274b..fef467d4c 100644 --- a/navit/navit/fonts/CMakeLists.txt +++ b/navit/navit/fonts/CMakeLists.txt @@ -6,7 +6,7 @@ add_custom_target( fonts ALL DEPENDS ${NAVIT_FONTS} ) install( - FILES ${NAVIT_FONTS} + FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.ttf DESTINATION ${SHARE_DIR}/fonts PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) |