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 /kfile-plugins/pdf | |
| 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 'kfile-plugins/pdf')
| -rw-r--r-- | kfile-plugins/pdf/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | kfile-plugins/pdf/ConfigureChecks.cmake | 16 |
2 files changed, 2 insertions, 20 deletions
diff --git a/kfile-plugins/pdf/CMakeLists.txt b/kfile-plugins/pdf/CMakeLists.txt index 748b70ed..c75dcf3f 100644 --- a/kfile-plugins/pdf/CMakeLists.txt +++ b/kfile-plugins/pdf/CMakeLists.txt @@ -9,14 +9,12 @@ # ################################################# -include( ConfigureChecks.cmake ) - include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} - ${POPPLER_QT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt ) link_directories( @@ -33,6 +31,6 @@ install( FILES kfile_pdf.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( kfile_pdf AUTOMOC SOURCES kfile_pdf.cpp - LINK kio-shared ${POPPLER_QT_LIBRARIES} + LINK kio-shared -L${CMAKE_BINARY_DIR}/kfile-plugins/dependencies/poppler-tqt -lpoppler-tqt DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kfile-plugins/pdf/ConfigureChecks.cmake b/kfile-plugins/pdf/ConfigureChecks.cmake deleted file mode 100644 index 28a617f1..00000000 --- a/kfile-plugins/pdf/ConfigureChecks.cmake +++ /dev/null @@ -1,16 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -# poppler-qt -pkg_search_module( POPPLER_QT poppler-qt ) -if( NOT POPPLER_QT_FOUND ) - tde_message_fatal( "poppler-qt is required, but was not found on your system" ) -endif( ) |