diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-31 07:59:02 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-31 07:59:02 +0000 |
| commit | 7f6f7ab54231fd0a158129721bbe5ef8191f0587 (patch) | |
| tree | 1f11e3408c78843641705b5d157c2e1b5c90fcb9 | |
| parent | 83b9df8edf5bf3eb61e5d2e956695f96500359c1 (diff) | |
| download | tdegraphics-7f6f7ab54231fd0a158129721bbe5ef8191f0587.tar.gz tdegraphics-7f6f7ab54231fd0a158129721bbe5ef8191f0587.zip | |
Add test for poppler >= 0.16 due to API change
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1244150 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kfaxview/libkfaximage/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake | 12 |
3 files changed, 18 insertions, 2 deletions
diff --git a/kfaxview/libkfaximage/CMakeLists.txt b/kfaxview/libkfaximage/CMakeLists.txt index d3813b67..e2e81a5b 100644 --- a/kfaxview/libkfaximage/CMakeLists.txt +++ b/kfaxview/libkfaximage/CMakeLists.txt @@ -23,7 +23,7 @@ link_directories( #### kfaximage (library) ######################## -tde_add_library( kfaximage AUTOMOC +tde_add_library( kfaximage STATIC_PIC AUTOMOC SOURCES kfaximage.cpp faxexpand.cpp faxinit.cpp ) diff --git a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt index 39984c71..23638219 100644 --- a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt +++ b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt @@ -11,6 +11,10 @@ project( libpoppler-tqt ) +##### configure checks ########################## + +include( ConfigureChecks.cmake ) + include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} @@ -41,4 +45,4 @@ tde_add_library( poppler-tqt SHARED AUTOMOC VERSION 0.0.0 LINK poppler ${TQT_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} -)
\ No newline at end of file +) diff --git a/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake new file mode 100644 index 00000000..a021744c --- /dev/null +++ b/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake @@ -0,0 +1,12 @@ +tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) +set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS}) +set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} "-lpoppler" ) +check_cxx_source_compiles(" + #include <poppler/PSOutputDev.h> + int main(int, char**) { int a; int b; PSOutputDev *psOut = new PSOutputDev(\"test\", (PDFDoc*)0, (XRef*)0, (Catalog*)0, NULL, 0, 0, psModePS, a, b); } " + HAVE_POPPLER_016 ) +tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) + +if( HAVE_POPPLER_016 ) + set( POPPLER_016 1 ) +endif( ) |