← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to debian/patches/find-cimg

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/find-cimg
1
 
--- a/CMakeLists.txt
2
 
+++ b/CMakeLists.txt
3
 
@@ -196,6 +196,8 @@ ENDIF (${KDE_VERSION} VERSION_GREATER "4
4
 
 
5
 
 MACRO_OPTIONAL_FIND_PACKAGE(Doxygen)
6
 
 
7
 
+PKG_CHECK_MODULES(Cimg cimg>=1.3.3)
8
 
+
9
 
 # Set config file depending of optional dependencies
10
 
 
11
 
 CONFIGURE_FILE(config-digikam.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-digikam.h)