From 57de13cb88c15a51d76cfdef8e2ac49e2791f01e Mon Sep 17 00:00:00 2001
From: Thomas Moulard <thomas.moulard@gmail.com>
Date: Mon, 20 May 2013 17:20:00 +0900
Subject: [PATCH] Update patch
---
debian/libvisp-dev.install | 1 +
...ig.h-in-include-architecture-triplet.patch | 19 +++++--------------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/debian/libvisp-dev.install b/debian/libvisp-dev.install
index a5599b77..4470e706 100644
--- a/debian/libvisp-dev.install
+++ b/debian/libvisp-dev.install
@@ -1,5 +1,6 @@
usr/bin/visp-config
usr/include/*
+usr/include/*/visp/*
usr/lib/*/libvisp.so
usr/lib/*/pkgconfig/*
usr/lib/*/visp/*.cmake
diff --git a/debian/patches/0004-Install-vpConfig.h-in-include-architecture-triplet.patch b/debian/patches/0004-Install-vpConfig.h-in-include-architecture-triplet.patch
index c82dc0e5..b95cb7bf 100644
--- a/debian/patches/0004-Install-vpConfig.h-in-include-architecture-triplet.patch
+++ b/debian/patches/0004-Install-vpConfig.h-in-include-architecture-triplet.patch
@@ -2,6 +2,10 @@ From: Thomas Moulard <thomas.moulard@gmail.com>
Date: Wed, 15 May 2013 14:18:03 +0900
Subject: Install vpConfig.h in include/<architecture triplet>.
+Install vpConfig.h in include/<architecture triplet>.
+
+Author: Thomas Moulard <thomas.moulard@gmail.com>
+Forwarded: no (not relevant)
---
CMakeLists.txt | 2 +-
CMakeModules/GenerateConfigScript.cmake | 2 +-
@@ -16,20 +20,7 @@ index fdcb0b0..b6f8ac8 100644
# Install vpConfig.h that may differ from the one in include/visp
INSTALL(FILES ${VISP_BINARY_DIR}/install/vpConfig.h
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/visp
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/visp/${CMAKE_LIBRARY_ARCHITECTURE}
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LIBRARY_ARCHITECTURE}/visp
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
COMPONENT headers
)
-diff --git a/CMakeModules/GenerateConfigScript.cmake b/CMakeModules/GenerateConfigScript.cmake
-index 6200a06..73389d6 100644
---- a/CMakeModules/GenerateConfigScript.cmake
-+++ b/CMakeModules/GenerateConfigScript.cmake
-@@ -158,7 +158,7 @@ IF (UNIX)
- #----------------------------------------------------------------------
-
- # prepend with ViSP own include dir
-- set(VISP_CONFIG_CFLAGS_SCRIPT "-I$PREFIX/${CMAKE_INSTALL_INCLUDEDIR} ${VISP_CONFIG_CFLAGS}")
-+ set(VISP_CONFIG_CFLAGS_SCRIPT "-I$PREFIX/${CMAKE_INSTALL_INCLUDEDIR} -I$PREFIX/${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LIBRARY_ARCHITECTURE} ${VISP_CONFIG_CFLAGS}")
-
- # prepend with ViSP own lib dir
- SET(VISP_CONFIG_LIBS_SCRIPT "-L$PREFIX/${CMAKE_INSTALL_LIBDIR} -l${VISP_INTERN_LIBRARY} ${VISP_CONFIG_LIBS}")
--
GitLab