Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 464f4d74 authored by Thomas Moulard's avatar Thomas Moulard
Browse files

Update patches.

parent 97f896ee
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
debian/patches/0004-Install-vpConfig.h-in-include-architecture-triplet.patch
+ 14
− 5
View file @ 464f4d74
......@@ -2,10 +2,6 @@ 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
---
CMakeLists.txt | 2 +-
CMakeModules/GenerateConfigScript.cmake | 2 +-
......@@ -20,7 +16,20 @@ 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}/${CMAKE_LIBRARY_ARCHITECTURE}/visp
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/visp/${CMAKE_LIBRARY_ARCHITECTURE}
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}")
debian/patches/0005-Remove-the-need-for-VISPLibraryDepends.cmake.patch → debian/patches/0005-Fix-CMake-files-to-support-multiarch.patch
+ 127
− 0
View file @ 464f4d74
From: Thomas Moulard <thomas.moulard@gmail.com>
Date: Mon, 20 May 2013 15:53:37 +0900
Subject: Remove the need for VISPLibraryDepends.cmake.
Date: Mon, 20 May 2013 16:50:17 +0900
Subject: Fix CMake files to support multiarch.
Remove the need for VISPLibraryDepends.cmake.
Fix CMake files to support multiarch.
Origin: upstream
Origin: upstream, private communication.
Author: Fabien Spindler <fabien.spindler@inria.fr>
---
CMakeLists.txt | 11 -----------
CMakeLists.txt | 31 +++++++++++--------------------
CMakeModules/VISPConfig.cmake.in | 3 ---
distclean.sh | 1 -
3 files changed, 15 deletions(-)
3 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6f8ac8..2b12257 100644
index b6f8ac8..a6810c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1972,12 +1972,6 @@ CONFIGURE_FILE(
@@ -1952,9 +1952,10 @@ ADD_CUSTOM_TARGET(uninstall
set(VISP_ROOT_DIR_CONFIGCMAKE "${VISP_BINARY_DIR}")
set(VISP_ROOT_DIR_CMAKE_CONFIGCMAKE "${VISP_BINARY_DIR}")
+set(VISP_ROOT_DIR_DATA_CONFIGCMAKE "${VISP_BINARY_DIR}")
-SET(VISP_SCENES_DIR ${VISP_ROOT_DIR_CMAKE_CONFIGCMAKE}/data/wireframe-simulator)
-SET(VISP_ROBOT_ARMS_DIR ${VISP_ROOT_DIR_CMAKE_CONFIGCMAKE}/data/robot-simulator)
+SET(VISP_SCENES_DIR ${VISP_ROOT_DIR_DATA_CONFIGCMAKE}/data/wireframe-simulator)
+SET(VISP_ROBOT_ARMS_DIR ${VISP_ROOT_DIR_DATA_CONFIGCMAKE}/data/robot-simulator)
# Generate the package dependent file include/visp/vpConfig.h
CONFIGURE_FILE(${VISP_SOURCE_DIR}/include/vpConfig.h.cmake
@@ -1972,12 +1973,6 @@ CONFIGURE_FILE(
${VISP_BINARY_DIR}/VISPUse.cmake
IMMEDIATE @ONLY)
......@@ -29,7 +42,35 @@ index b6f8ac8..2b12257 100644
# Generate the package dependent file include/visp/vpConfig.h
CONFIGURE_FILE(${VISP_SOURCE_DIR}/ViSP-third-party.txt.cmake
${VISP_BINARY_DIR}/ViSP-third-party.txt
@@ -2027,9 +2021,6 @@ INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
@@ -1989,20 +1984,22 @@ CONFIGURE_FILE(${VISP_SOURCE_DIR}/ViSP-third-party.txt.cmake
set(VISP_ROOT_DIR_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}")
IF(UNIX)
- set(VISP_ROOT_DIR_CMAKE_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/visp")
+ set(VISP_ROOT_DIR_CMAKE_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/visp")
+ set(VISP_ROOT_DIR_DATA_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/visp")
ELSE()
set(VISP_ROOT_DIR_CMAKE_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}")
+ set(VISP_ROOT_DIR_DATA_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}")
ENDIF()
-SET(VISP_SCENES_DIR ${VISP_ROOT_DIR_CMAKE_CONFIGCMAKE}/data/wireframe-simulator)
-SET(VISP_ROBOT_ARMS_DIR ${VISP_ROOT_DIR_CMAKE_CONFIGCMAKE}/data/robot-simulator)
+SET(VISP_SCENES_DIR ${VISP_ROOT_DIR_DATA_CONFIGCMAKE}/data/wireframe-simulator)
+SET(VISP_ROBOT_ARMS_DIR ${VISP_ROOT_DIR_DATA_CONFIGCMAKE}/data/robot-simulator)
# Only if resources.cfg created by hand, we change the path to resources.cfg in install/vpConfig.h
if(VISP_INSTALL_DIR_OGRE_RESOURCES)
- SET(VISP_HAVE_OGRE_RESOURCES_PATH ${VISP_ROOT_DIR_CMAKE_CONFIGCMAKE}/data/ogre-simulator)
+ SET(VISP_HAVE_OGRE_RESOURCES_PATH ${VISP_ROOT_DIR_DATA_CONFIGCMAKE}/data/ogre-simulator)
endif()
# Only if plugins.cfg created by hand, we change the path to plugins.cfg in install/vpConfig.h
if(VISP_INSTALL_DIR_OGRE_RESOURCES)
- SET(VISP_HAVE_OGRE_PLUGINS_PATH ${VISP_ROOT_DIR_CMAKE_CONFIGCMAKE}/data/ogre-simulator)
+ SET(VISP_HAVE_OGRE_PLUGINS_PATH ${VISP_ROOT_DIR_DATA_CONFIGCMAKE}/data/ogre-simulator)
endif()
# Generate the package dependent file include/visp/vpConfig.h
@@ -2027,9 +2024,6 @@ INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
CMAKE_EXPORT_BUILD_SETTINGS(
${VISP_BINARY_DIR}/install/VISPBuildSettings.cmake
)
......@@ -39,15 +80,18 @@ index b6f8ac8..2b12257 100644
# Install vpConfig.h that may differ from the one in include/visp
INSTALL(FILES ${VISP_BINARY_DIR}/install/vpConfig.h
@@ -2068,7 +2059,6 @@ IF(UNIX)
@@ -2068,9 +2062,7 @@ IF(UNIX)
${VISP_BINARY_DIR}/install/VISPUse.cmake
${VISP_BINARY_DIR}/install/VISPConfig.cmake
${VISP_BINARY_DIR}/install/VISPBuildSettings.cmake
- ${VISP_BINARY_DIR}/install/VISPLibraryDepends.cmake
${VISP_BINARY_DIR}/ViSP-third-party.txt
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp
- ${VISP_BINARY_DIR}/ViSP-third-party.txt
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/visp
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
@@ -2095,7 +2085,6 @@ ELSE()
COMPONENT libraries
)
@@ -2095,7 +2087,6 @@ ELSE()
${VISP_BINARY_DIR}/install/VISPUse.cmake
${VISP_BINARY_DIR}/install/VISPConfig.cmake
${VISP_BINARY_DIR}/install/VISPBuildSettings.cmake
......
debian/patches/series
+ 1
− 1
View file @ 464f4d74
......@@ -2,4 +2,4 @@
0002-Use-pkg-config-to-retrieve-dependencies.patch
0003-Fix-cppcheck-errors.patch
0004-Install-vpConfig.h-in-include-architecture-triplet.patch
0005-Remove-the-need-for-VISPLibraryDepends.cmake.patch
0005-Fix-CMake-files-to-support-multiarch.patch
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment