[ossim-plugins] 02/02: Link libraw properly, pkg-config sets _LIBRARIES & _INCLUDE_DIRS.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository ossim-plugins.

commit d664fd7d3ea04ad3af6e814e768027c2fc0b46bd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 29 16:31:43 2016 +0200

    Link libraw properly, pkg-config sets _LIBRARIES & _INCLUDE_DIRS.
---
 debian/patches/libraw.patch | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/patches/libraw.patch b/debian/patches/libraw.patch
index e84346d..8723e80 100644
--- a/debian/patches/libraw.patch
+++ b/debian/patches/libraw.patch
@@ -14,7 +14,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
  find_package(JPEG)
  find_package(TIFF)
 -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${LIBRAW_SRC} ${JPEG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${LIBRAW_INCLUDE_DIR} ${JPEG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${LIBRAW_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR})
  
 -FILE(GLOB OSSIMPLUGIN_SRCS ${LIBRAW_SRC}/internal/*.cpp ${LIBRAW_SRC}/src/*.cpp *.cpp)
 -FILE(GLOB OSSIMPLUGIN_HEADERS ${LIBRAW_SRC}/internal/*.h *.h ${LIBRAW_SRC}/libraw/*.h)
@@ -23,12 +23,14 @@ Author: Bas Couwenberg <sebastic at debian.org>
  
  ####
  # OSSIMPLUGINSMAKINGDLL controls dll linkage on windows.  
-@@ -29,7 +31,7 @@ endif(OSSIM_INSTALL_PLUGINS_WITH_VERSION
+@@ -29,9 +31,8 @@ endif(OSSIM_INSTALL_PLUGINS_WITH_VERSION
  
  OSSIM_LINK_LIBRARY(${LIB_NAME}
                     COMPONENT_NAME ossim TYPE "${OSSIM_PLUGIN_LINK_TYPE}"
 -		   LIBRARIES ${OSSIM_LIBRARIES} ${OPENTHREADS_LIBRARY} ${JPEG_LIBRARY} ${TIFF_LIBRARY}
-+		   LIBRARIES ${OSSIM_LIBRARIES} ${OPENTHREADS_LIBRARY} ${LIBRAW_LIBRARY} ${JPEG_LIBRARY} ${TIFF_LIBRARY}
++		   LIBRARIES ${OSSIM_LIBRARIES} ${OPENTHREADS_LIBRARY} ${LIBRAW_LIBRARIES} ${JPEG_LIBRARY} ${TIFF_LIBRARY}
                     HEADERS "${OSSIMPLUGIN_HEADERS}"
  		   SOURCE_FILES "${OSSIMPLUGIN_SRCS}" ADDITIONAL_COMPILE_FLAGS "-DLIBRAW_NOTHREADS -DLIBRAW_NODLL"
                     INSTALL_LIB)
+ 
+-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim-plugins.git