digikam-4.6.0.install-libs-dev.patch 4.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889
  1. diff -U 3 -H -d -r -N -- digikam-4.6.0/extra/libkface/libkface/CMakeLists.txt digikam-4.6.0.install-libs-dev/extra/libkface/libkface/CMakeLists.txt
  2. --- digikam-4.6.0/extra/libkface/libkface/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100
  3. +++ digikam-4.6.0.install-libs-dev/extra/libkface/libkface/CMakeLists.txt 2015-01-03 21:03:21.172580963 +0100
  4. @@ -63,9 +63,6 @@
  5. install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/database/dbconfig.xml
  6. DESTINATION ${DATA_INSTALL_DIR}/libkface/database )
  7. -# Check if compilation is done through digiKam SC or not. If yes, do not install header files.
  8. -if(NOT DIGIKAMSC_COMPILE_LIBKFACE)
  9. -
  10. install(FILES facedetector.h
  11. recognitiondatabase.h
  12. identity.h
  13. @@ -76,9 +73,7 @@
  14. )
  15. if(NOT WIN32)
  16. - configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkface.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.pc)
  17. - configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkface.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.lsm)
  18. + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkface.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.pc)
  19. + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkface.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.lsm)
  20. install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkface.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
  21. endif()
  22. -
  23. -endif()
  24. diff -U 3 -H -d -r -N -- digikam-4.6.0/extra/libkgeomap/libkgeomap/CMakeLists.txt digikam-4.6.0.install-libs-dev/extra/libkgeomap/libkgeomap/CMakeLists.txt
  25. --- digikam-4.6.0/extra/libkgeomap/libkgeomap/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100
  26. +++ digikam-4.6.0.install-libs-dev/extra/libkgeomap/libkgeomap/CMakeLists.txt 2015-01-03 21:03:38.204621741 +0100
  27. @@ -73,9 +73,6 @@
  28. install(TARGETS kgeomap ${INSTALL_TARGETS_DEFAULT_ARGS})
  29. -# Check if compilation is done through digiKam SC or not. If yes, do not install header files.
  30. -if(NOT DIGIKAMSC_COMPILE_LIBKGEOMAP)
  31. -
  32. install(FILES libkgeomap_export.h
  33. abstractmarkertiler.h
  34. dragdrophandler.h
  35. @@ -94,14 +91,12 @@
  36. )
  37. if(NOT WIN32)
  38. - configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkgeomap.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc)
  39. - configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkgeomap.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.lsm)
  40. + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkgeomap.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc)
  41. + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkgeomap.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.lsm)
  42. install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
  43. endif()
  44. # Install find cmake script to the system for client applications.
  45. - install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindKGeoMap.cmake
  46. + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/FindKGeoMap.cmake
  47. DESTINATION ${DATA_INSTALL_DIR}/cmake/modules)
  48. -
  49. -endif()
  50. diff -U 3 -H -d -r -N -- digikam-4.6.0/extra/libmediawiki/libmediawiki/CMakeLists.txt digikam-4.6.0.install-libs-dev/extra/libmediawiki/libmediawiki/CMakeLists.txt
  51. --- digikam-4.6.0/extra/libmediawiki/libmediawiki/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100
  52. +++ digikam-4.6.0.install-libs-dev/extra/libmediawiki/libmediawiki/CMakeLists.txt 2015-01-03 21:03:05.940544498 +0100
  53. @@ -40,9 +40,6 @@
  54. install(TARGETS mediawiki ${INSTALL_TARGETS_DEFAULT_ARGS})
  55. -# Check if compilation is done through digiKam SC or not. If yes, do not install header files.
  56. -if(NOT DIGIKAMSC_COMPILE_LIBMEDIAWIKI)
  57. -
  58. install(FILES image.h
  59. imageinfo.h
  60. mediawiki.h
  61. @@ -68,14 +65,12 @@
  62. DESTINATION ${INCLUDE_INSTALL_DIR}/libmediawiki COMPONENT Devel)
  63. if(NOT WIN32)
  64. - configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libmediawiki.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.pc)
  65. - configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libmediawiki.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.lsm)
  66. + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libmediawiki.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.pc)
  67. + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libmediawiki.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.lsm)
  68. install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
  69. endif()
  70. # Install find cmake script to the system for client applications.
  71. - install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindMediawiki.cmake
  72. + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/FindMediawiki.cmake
  73. DESTINATION ${DATA_INSTALL_DIR}/cmake/modules)
  74. -
  75. -endif()