Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gepetto
robotpkg-wip
Commits
912317fb
Commit
912317fb
authored
5 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
[wip/py-libnabo] fix Boost::Python detection
parent
db585e76
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
py-libnabo/Makefile
+6
-0
6 additions, 0 deletions
py-libnabo/Makefile
py-libnabo/distinfo
+1
-0
1 addition, 0 deletions
py-libnabo/distinfo
py-libnabo/patches/patch-ab
+13
-0
13 additions, 0 deletions
py-libnabo/patches/patch-ab
with
20 additions
and
0 deletions
py-libnabo/Makefile
+
6
−
0
View file @
912317fb
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
ORG
=
ethz-asl
ORG
=
ethz-asl
NAME
=
libnabo
NAME
=
libnabo
VERSION
=
1.0.7
VERSION
=
1.0.7
PKGREVISION
=
1
DISTNAME
=
${
VERSION
}
DISTNAME
=
${
VERSION
}
PKGNAME
=
${
PKGTAG.python-
}${
NAME
}
-
${
VERSION
}
PKGNAME
=
${
PKGTAG.python-
}${
NAME
}
-
${
VERSION
}
...
@@ -24,9 +25,13 @@ USE_BOOST_LIBS= python
...
@@ -24,9 +25,13 @@ USE_BOOST_LIBS= python
PYTHON_MINOR
=
$(
word 2,
$(
subst ., ,
${
PYTHON_VERSION
}))
PYTHON_MINOR
=
$(
word 2,
$(
subst ., ,
${
PYTHON_VERSION
}))
Boost_PYTHON_LIBRARY
=
$(
filter %.so,
${
SYSTEM_FILES.boost-lib-python
})
CMAKE_ARGS
+=
-DSHARED_LIBS
=
true
CMAKE_ARGS
+=
-DSHARED_LIBS
=
true
CMAKE_ARGS
+=
-DPYTHON_VERSION_MAJOR
=
${
PYTHON_MAJOR
}
CMAKE_ARGS
+=
-DPYTHON_VERSION_MAJOR
=
${
PYTHON_MAJOR
}
CMAKE_ARGS
+=
-DPYTHON_VERSION_MINOR
=
${
PYTHON_MINOR
}
CMAKE_ARGS
+=
-DPYTHON_VERSION_MINOR
=
${
PYTHON_MINOR
}
CMAKE_ARGS
+=
-DBoost_PYTHON_LIBRARY
=
${
Boost_PYTHON_LIBRARY
}
CMAKE_ARGS
+=
-DBoost_PYTHON_LIBRARY_RELEASE
=
${
Boost_PYTHON_LIBRARY
}
CMAKE_ARGS
+=
-DBoost_PYTHON_LIBRARY_DEBUG
=
${
Boost_PYTHON_LIBRARY
}
include
../../devel/boost-headers/depend.mk
include
../../devel/boost-headers/depend.mk
include
../../devel/boost-libs/depend.mk
include
../../devel/boost-libs/depend.mk
...
@@ -36,6 +41,7 @@ include ../../mk/sysdep/cmake.mk
...
@@ -36,6 +41,7 @@ include ../../mk/sysdep/cmake.mk
include
../../mk/sysdep/doxygen.mk
include
../../mk/sysdep/doxygen.mk
include
../../mk/sysdep/pdflatex.mk
include
../../mk/sysdep/pdflatex.mk
include
../../mk/sysdep/python.mk
include
../../mk/sysdep/python.mk
include
../../mk/sysdep/py-numpy.mk
include
../../mk/language/c.mk
include
../../mk/language/c.mk
include
../../mk/language/c++11.mk
include
../../mk/language/c++11.mk
include
../../mk/robotpkg.mk
include
../../mk/robotpkg.mk
This diff is collapsed.
Click to expand it.
py-libnabo/distinfo
+
1
−
0
View file @
912317fb
...
@@ -2,3 +2,4 @@ SHA1 (1.0.7.tar.gz) = b966b712c55c93628089dc771067adfd7b16593d
...
@@ -2,3 +2,4 @@ SHA1 (1.0.7.tar.gz) = b966b712c55c93628089dc771067adfd7b16593d
RMD160 (1.0.7.tar.gz) = aa59ec3ea2c5a1391a31fe15af259be9995eff96
RMD160 (1.0.7.tar.gz) = aa59ec3ea2c5a1391a31fe15af259be9995eff96
Size (1.0.7.tar.gz) = 974686 bytes
Size (1.0.7.tar.gz) = 974686 bytes
SHA1 (patch-aa) = b8468d9f53b7c9a5caa1a6dd32be53a861e152a6
SHA1 (patch-aa) = b8468d9f53b7c9a5caa1a6dd32be53a861e152a6
SHA1 (patch-ab) = 23ded35441c6268f94999cb4ab104f679680fb99
This diff is collapsed.
Click to expand it.
py-libnabo/patches/patch-ab
0 → 100644
+
13
−
0
View file @
912317fb
Fix Boost::Python lib detection
--- python/CMakeLists.txt.orig 2019-02-08 06:31:26.000000000 +0100
+++ python/CMakeLists.txt 2020-01-17 19:32:56.868020743 +0100
@@ -43,7 +43,7 @@
endif(PYTHON_VERSION_MAJOR GREATER 2)
endif (PYTHON_DEB_INSTALL_TARGET)
- find_package(Boost COMPONENTS ${BOOST_PYTHON_COMPONENT})
+ find_package(Boost COMPONENTS python)
find_python_module(numpy)
find_package_handle_standard_args(numpy DEFAULT_MSG PY_NUMPY)
if (Boost_FOUND AND NUMPY_FOUND)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment