Skip to content
Snippets Groups Projects
Commit 21a4ac27 authored by Arnaud Degroote's avatar Arnaud Degroote
Browse files

[wip/jafar-rtslam] Fix the computing of pkg-config requirements

It now includes the jafar module selected by options too.
Bump PKGREVISION (again).
parent 9c666480
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,7 @@
#
JAFAR_PKG= rtslam-0.2
PKGREVISION= 4
PKGREVISION= 5
CATEGORIES= wip
JAFAR_COMMENT= Jafar module to do fast and generic EKF Slam.
......
SHA1 (jafar-rtslam-0.2.tar.gz) = 1b4c9ef2fbc8c32259a48ef297a8baf6dd7d10f5
RMD160 (jafar-rtslam-0.2.tar.gz) = b6840c5170beef8b4c409c86da74ac3cf9841353
Size (jafar-rtslam-0.2.tar.gz) = 733290 bytes
SHA1 (patch-aa) = f5e95671e0ded99b9f2207ac93764da44bffda3c
SHA1 (patch-aa) = 6d390a243ce4c0ba960c089573e4124f2d3961f8
SHA1 (patch-ab) = fdaab1bc3511fdbb78b201782b8a0ffc76ed22ce
SHA1 (patch-ac) = e9bf8fe7288a956fa84e00c9449831e28bb50a00
SHA1 (patch-ad) = 4d0ae943a4ea8f97c65f31a056c5d0deaf5607f4
SHA1 (patch-ae) = 7c1a788ca3c33430f5b6cb52ad10bdccd2f6a03a
Fix syntax + naming of requirements
--- jafar-rtslam.pc.in.orig 2013-03-19 12:12:35.114904384 +0100
+++ jafar-rtslam.pc.in 2013-03-19 12:12:57.694903817 +0100
--- jafar-rtslam.pc.in.orig 2013-06-10 18:03:26.782750072 +0200
+++ jafar-rtslam.pc.in 2013-06-10 18:03:44.814749620 +0200
@@ -6,6 +6,6 @@
Name: jafar-rtslam
Description: Jafar module to do fast and generic EKF Slam.
Version: 0.2
-Requires: kernel;image;jmath;correl
+Requires: jafar-kernel,jafar-image,jafar-jmath,jafar-correl
-Libs: -L${CMAKE_INSTALL_PREFIX} -ljafar-rtslam
+Requires: ${JAFAR_REQUIRES}
+Libs: -L${CMAKE_INSTALL_PREFIX}/lib -ljafar-rtslam
Cflags: -I${CMAKE_INSTALL_PREFIX}/include/jafar ${IMPORTED_HEADERS} ${EXTRA_COMPILE_FLAGS}
--- CMakeLists.txt.orig 2013-06-10 18:06:30.130745479 +0200
+++ CMakeLists.txt 2013-06-10 18:06:51.646744939 +0200
@@ -65,6 +65,7 @@
string(TOUPPER "${module}" MODULE)
include(${CMAKE_INSTALL_PREFIX}/share/cmake/jafar/${module}.cmake)
set(LIBS "${LIBS};jafar-${module}")
+ set(JAFAR_REQUIRES "${JAFAR_REQUIRES},jafar-${module}")
include_directories(${JAFAR_${module}_IMPORTED_HEADERS})
set(EXTRA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -DHAVE_MODULE_${MODULE}")
endmacro(link_jafar_module)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment