File simplify-cmake-finders.patch of Package hdrmerge
Index: hdrmerge/CMakeLists.txt
===================================================================
--- hdrmerge.orig/CMakeLists.txt
+++ hdrmerge/CMakeLists.txt
@@ -41,7 +41,7 @@ find_package(Qt5 5.6 REQUIRED Core Widge
add_definitions(${QT_DEFINITIONS})
find_package(LibRaw REQUIRED)
-find_package(Exiv2 REQUIRED)
+find_package(exiv2 REQUIRED)
find_package(ZLIB REQUIRED)
find_package(OpenMP)
@@ -55,10 +55,10 @@ else()
endif()
include_directories(
- "${LibRaw_INCLUDE_DIR}"
- "${EXIV2_INCLUDE_DIR}"
- "${ZLIB_INCLUDE_DIRS}"
- "${ALGLIB_INCLUDES}"
+ "${LibRaw_INCLUDE_DIRS}"
+ exiv2
+ "${ZLIB_INCLUDE_DIRS}"
+ "${ALGLIB_INCLUDES}"
)
if(NOT(CMAKE_BUILD_TYPE))
@@ -188,7 +188,7 @@ endif()
# Libs
set(hdrmerge_libs
"${LibRaw_r_LIBRARIES}"
- "${EXIV2_LIBRARY}"
+ "${exiv2_LIBRARIES}"
"${ZLIB_LIBRARIES}"
)
@@ -274,7 +274,7 @@ else()
)
endif()
-target_link_libraries(hdrmerge ${STRIP} ${hdrmerge_libs} Qt5::Widgets)
+target_link_libraries(hdrmerge ${STRIP} ${hdrmerge_libs} Qt5::Widgets exiv2)
if(WIN32)
# Compile a target without GUI, for the .com executable
Index: hdrmerge/cmake/FindLibRaw.cmake
===================================================================
--- hdrmerge.orig/cmake/FindLibRaw.cmake
+++ hdrmerge/cmake/FindLibRaw.cmake
@@ -17,59 +17,11 @@
FIND_PACKAGE(PkgConfig)
IF(PKG_CONFIG_FOUND)
- PKG_CHECK_MODULES(PC_LIBRAW libraw)
- SET(LibRaw_DEFINITIONS ${PC_LIBRAW_CFLAGS_OTHER})
-
- PKG_CHECK_MODULES(PC_LIBRAW_R libraw_r)
- SET(LibRaw_r_DEFINITIONS ${PC_LIBRAW_R_CFLAGS_OTHER})
-ENDIF()
-
-FIND_PATH(LibRaw_INCLUDE_DIR libraw.h
- HINTS
- ${PC_LIBRAW_INCLUDEDIR}
- ${PC_LibRaw_INCLUDE_DIRS}
- PATH_SUFFIXES libraw
- )
-
-FIND_LIBRARY(LibRaw_LIBRARIES NAMES raw
- HINTS
- ${PC_LIBRAW_LIBDIR}
- ${PC_LIBRAW_LIBRARY_DIRS}
- )
-
-FIND_LIBRARY(LibRaw_r_LIBRARIES NAMES raw_r
- HINTS
- ${PC_LIBRAW_R_LIBDIR}
- ${PC_LIBRAW_R_LIBRARY_DIRS}
- )
-
-IF(LibRaw_INCLUDE_DIR)
- FILE(READ ${LibRaw_INCLUDE_DIR}/libraw_version.h _libraw_version_content)
-
- STRING(REGEX MATCH "#define LIBRAW_MAJOR_VERSION[ \t]*([0-9]*)\n" _version_major_match ${_libraw_version_content})
- SET(_libraw_version_major "${CMAKE_MATCH_1}")
-
- STRING(REGEX MATCH "#define LIBRAW_MINOR_VERSION[ \t]*([0-9]*)\n" _version_minor_match ${_libraw_version_content})
- SET(_libraw_version_minor "${CMAKE_MATCH_1}")
-
- STRING(REGEX MATCH "#define LIBRAW_PATCH_VERSION[ \t]*([0-9]*)\n" _version_patch_match ${_libraw_version_content})
- SET(_libraw_version_patch "${CMAKE_MATCH_1}")
-
- IF(_version_major_match AND _version_minor_match AND _version_patch_match)
- SET(LibRaw_VERSION_STRING "${_libraw_version_major}.${_libraw_version_minor}.${_libraw_version_patch}")
- ELSE()
- IF(NOT LibRaw_FIND_QUIETLY)
- MESSAGE(STATUS "Failed to get version information from ${LibRaw_INCLUDE_DIR}/libraw_version.h")
- ENDIF()
- ENDIF()
+ PKG_CHECK_MODULES(LibRaw libraw)
+ PKG_CHECK_MODULES(LibRaw_r libraw_r)
ENDIF()
INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibRaw
- REQUIRED_VARS LibRaw_LIBRARIES LibRaw_INCLUDE_DIR
- VERSION_VAR LibRaw_VERSION_STRING
- )
-
MARK_AS_ADVANCED(LibRaw_VERSION_STRING
LibRaw_INCLUDE_DIR
LibRaw_LIBRARIES