diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-31 06:24:04 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-31 06:24:04 +0000 |
| commit | 83b9df8edf5bf3eb61e5d2e956695f96500359c1 (patch) | |
| tree | 0a8ddc5f0c1700cec2aaed2bc3960f08dc7efa4f /ksvg | |
| parent | 56e79472366b958a2ffa31f2cf02cd908d064c8e (diff) | |
| download | tdegraphics-83b9df8edf5bf3eb61e5d2e956695f96500359c1.tar.gz tdegraphics-83b9df8edf5bf3eb61e5d2e956695f96500359c1.zip | |
Fix kdegraphics CMake compilation
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1244149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksvg')
| -rw-r--r-- | ksvg/ConfigureChecks.cmake | 10 | ||||
| -rw-r--r-- | ksvg/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ksvg/impl/libs/libtext2path/src/CMakeLists.txt | 12 |
3 files changed, 23 insertions, 1 deletions
diff --git a/ksvg/ConfigureChecks.cmake b/ksvg/ConfigureChecks.cmake index 9ff7d8ca..76177f57 100644 --- a/ksvg/ConfigureChecks.cmake +++ b/ksvg/ConfigureChecks.cmake @@ -45,3 +45,13 @@ if( FRIBIDI_FOUND ) else( ) tde_message_fatal( "fribidi is required, but was not found on your system" ) endif( ) + + +##### check for fontconfig ###################### + +pkg_search_module( FONTCONFIG fontconfig ) +if( NOT FONTCONFIG_FOUND ) + message(FATAL_ERROR "\nfontconfig are required, but not found on your system" ) +endif( NOT FONTCONFIG_FOUND ) +set( HAVE_FONTCONFIG 1 CACHE INTERNAL "" FORCE ) + diff --git a/ksvg/core/CMakeLists.txt b/ksvg/core/CMakeLists.txt index 13def4fd..4f3136d2 100644 --- a/ksvg/core/CMakeLists.txt +++ b/ksvg/core/CMakeLists.txt @@ -37,7 +37,7 @@ install( FILES install( FILES ksvgrenderer.desktop - DESTINATION ${SERVICES_INSTALL_DIR} ) + DESTINATION ${SERVICETYPES_INSTALL_DIR} ) ##### ksvgcore (static) ######################### diff --git a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt index 7e1cee2c..098f836d 100644 --- a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt +++ b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt @@ -17,6 +17,7 @@ include_directories( ${TQT_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ${FRIBIDI_INCLUDE_DIRS} + ${FONTCONFIG_INCLUDE_DIRS} ) @@ -35,3 +36,14 @@ tde_add_library( text2path STATIC_PIC Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp GlyphTracer.cpp Converter.cpp QtUnicode.cpp ) + +##### text2path (shared) ######################## + +tde_add_library( text2path SHARED + SOURCES + Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp + GlyphTracer.cpp Converter.cpp QtUnicode.cpp + VERSION 0.0.0 + LINK ${FREETYPE_LIBRARIES} ${FRIBIDI_LIBRARIES} ${FONTCONFIG_LIBRARIES} + DESTINATION ${LIB_INSTALL_DIR} +)
\ No newline at end of file |