nomacs-libqpsd.patch

   1 --- nomacs-3.4.1/cmake/Findqpsd.cmake.orig      1970-01-01 01:00:00.000000000 +0100
   2 +++ nomacs-3.4.1/cmake/Findqpsd.cmake   2016-09-10 21:25:00.580715267 +0200
   3 @@ -0,0 +1,16 @@
   4 +# QPSD_FOUND - system has the LIBQPSD library
   5 +# LIBQPSD_INCLUDE_DIRECTORY - the LIBQPSD include directory
   6 +# LIBQPSD_LIBRARY - The libraries needed to use LIBQPSD
   7 +
   8 +if(LIBQPSD_INCLUDE_DIRECTORY AND LIBQPSD_LIBRARY)
   9 +       set(QPSD_FOUND TRUE)
  10 +else()
  11 +       find_path(LIBQPSD_INCLUDE_DIRECTORY NAMES qpsdhandler.h PATH_SUFFIXES qt5)
  12 +
  13 +       find_library(LIBQPSD_LIBRARY NAMES qpsd5)
  14 +
  15 +       include(FindPackageHandleStandardArgs)
  16 +       find_package_handle_standard_args(QPSD DEFAULT_MSG LIBQPSD_INCLUDE_DIRECTORY LIBQPSD_LIBRARY)
  17 +
  18 +       mark_as_advanced(LIBQPSD_INCLUDE_DIRECTORY LIBQPSD_LIBRARY)
  19 +endif(LIBQPSD_INCLUDE_DIRECTORY AND LIBQPSD_LIBRARY)
  20 --- nomacs-3.4.1/CMakeLists.txt.orig    2016-09-10 21:27:15.454047058 +0200
  21 +++ nomacs-3.4.1/CMakeLists.txt 2016-09-10 21:27:26.287380269 +0200
  22 @@ -155,7 +155,7 @@
  23         ${HUPNP_INCLUDE_DIR}\r
  24         ${QUAZIP_INCLUDE_DIRECTORY}\r
  25         # ${ZLIB_INCLUDE_DIRS}\r
  26 -       ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd\r
  27 +       ${LIBQPSD_INCLUDE_DIRECTORY}\r
  28  )\r
  29  \r
  30  if (APPLE) # todo: somehow add this to Mac.cmake or MacBuildTarget.cmake\r
  31 --- nomacs-3.4.1/cmake/UnixBuildTarget.cmake.orig       2016-07-28 11:01:01.000000000 +0200
  32 +++ nomacs-3.4.1/cmake/UnixBuildTarget.cmake    2016-09-10 22:09:29.120684793 +0200
  33 @@ -14,7 +14,7 @@
  34  #binary
  35  link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS} ${CMAKE_BINARY_DIR})
  36  add_executable(${BINARY_NAME} WIN32  MACOSX_BUNDLE ${NOMACS_EXE_SOURCES} ${NOMACS_EXE_HEADERS} ${NOMACS_QM} ${NOMACS_TRANSLATIONS} ${NOMACS_RC} ${QUAZIP_SOURCES})
  37 -target_link_libraries(${BINARY_NAME} ${DLL_NAME} ${DLL_CORE_NAME} ${DLL_LOADER_NAME} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${QUAZIP_LIBRARIES} ${ZLIB_LIBRARY} ${LIBQPSD_LIBRARY})
  38 +target_link_libraries(${BINARY_NAME} ${DLL_NAME} ${DLL_CORE_NAME} ${DLL_LOADER_NAME} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${QUAZIP_LIBRARIES} ${ZLIB_LIBRARY})
  39
  40
  41  set_target_properties(${BINARY_NAME} PROPERTIES COMPILE_FLAGS "-DDK_DLL_IMPORT -DNOMINMAX")
  42 @@ -28,7 +28,7 @@
  43
  44  # add loader
  45  add_library(${DLL_LOADER_NAME} SHARED ${LOADER_SOURCES} ${NOMACS_UI} ${NOMACS_RCC} ${LOADER_HEADERS} ${AUTOFLOW_RC} ${QUAZIP_SOURCES} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS})
  46 -target_link_libraries(${DLL_LOADER_NAME} ${DLL_CORE_NAME} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${QUAZIP_LIBRARIES})
  47 +target_link_libraries(${DLL_LOADER_NAME} ${DLL_CORE_NAME} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${QUAZIP_LIBRARIES} ${LIBQPSD_LIBRARY})
  48  set_property(TARGET ${DLL_LOADER_NAME} PROPERTY VERSION ${NOMACS_VERSION_MAJOR}.${NOMACS_VERSION_MINOR}.${NOMACS_VERSION_PATCH})
  49  set_property(TARGET ${DLL_LOADER_NAME} PROPERTY SOVERSION ${NOMACS_VERSION_MAJOR})
  50