diff -Nru nomacs-1.6.5/CMakeLists.txt nomacs-1.6.5/CMakeLists.txt --- nomacs-1.6.5/CMakeLists.txt 2014-05-31 00:33:01.000000000 +0000 +++ nomacs-1.6.5/CMakeLists.txt 2014-06-04 00:30:56.000000000 +0000 @@ -207,9 +207,7 @@ ENDIF(ENABLE_WEBP) - IF (ENABLE_RAW) - # NOTE: libraw is used only when there is OpenCV found and used # LibRaw pkg_check_modules(LIBRAW libraw>=0.12.0) @@ -251,6 +249,7 @@ # OpenCV SET(OpenCV_LIBS "") + SET(OpenCV_FOUND false) if (PKG_CONFIG_FOUND) # not sure: pkgconfig is needed for old linux with old old opencv systems pkg_check_modules(OpenCV opencv>=2.1.0) SET(OpenCV_LIBS ${OpenCV_LIBRARIES}) @@ -288,10 +287,13 @@ ENDIF(ENABLE_RAW) #multi-layer tiff -IF(ENABLE_TIFF) - +IF(ENABLE_TIFF) # we try to grab the OpenCV's libtiff IF (MSVC) + IF(NOT OpenCV_FOUND) + message(FATAL_ERROR "OpenCV is mandotory when enabling TIFF. You have to enable RAW support") + ENDIF(NOT OpenCV_FOUND) + find_path(TIFF_BUILD_PATH NAMES "Release/libtiff.lib" "Debug/libtiffd.lib" PATHS "${OpenCV_3RDPARTY_LIB_DIR_OPT}/../" DOC "Path to the libtiff build directory" NO_DEFAULT_PATH) IF(EXISTS "${TIFF_BUILD_PATH}/Release/libtiff.lib" AND EXISTS "${TIFF_BUILD_PATH}/Debug/libtiffd.lib") FILE(COPY ${TIFF_BUILD_PATH}/Debug/libtiffd.lib DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/libs) diff -Nru nomacs-1.6.5/debian/bzr-builder.manifest nomacs-1.6.5/debian/bzr-builder.manifest --- nomacs-1.6.5/debian/bzr-builder.manifest 2014-05-31 00:33:04.000000000 +0000 +++ nomacs-1.6.5/debian/bzr-builder.manifest 2014-06-04 00:31:08.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}-1~105 -lp:nomacs revid:stefan@nomacs.org-20140531000011-alzzrugnby9ylv3s +# bzr-builder format 0.3 deb-version {debupstream}-1~106 +lp:nomacs revid:stefan@nomacs.org-20140604000009-i0jezm0abu6y69og nest-part debian lp:~nomacs/nomacs/packaging debian debian revid:stefan@nomacs.org-20140226124423-09qi80416iv7p53s diff -Nru nomacs-1.6.5/debian/changelog nomacs-1.6.5/debian/changelog --- nomacs-1.6.5/debian/changelog 2014-05-31 00:33:04.000000000 +0000 +++ nomacs-1.6.5/debian/changelog 2014-06-04 00:31:08.000000000 +0000 @@ -1,8 +1,8 @@ -nomacs (1.6.5-1~105~ubuntu12.10.1) quantal; urgency=low +nomacs (1.6.5-1~106~ubuntu12.10.1) quantal; urgency=low * Auto build. - -- Launchpad Package Builder Sat, 31 May 2014 00:33:04 +0000 + -- Launchpad Package Builder Wed, 04 Jun 2014 00:31:08 +0000 nomacs (1.6.5) precise; urgency=low