From 166b876dc1673bfad68f88c3157417f1a3452080 Mon Sep 17 00:00:00 2001 From: Thomas Roehr Date: Wed, 15 Sep 2021 11:53:54 +0200 Subject: [PATCH 1/3] Fix include path so that include works Testing with an autoproj separate prefix installation --- src/environment/mars_environment/mars_environment.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/environment/mars_environment/mars_environment.pc.in b/src/environment/mars_environment/mars_environment.pc.in index 05786cd5..1032a88f 100644 --- a/src/environment/mars_environment/mars_environment.pc.in +++ b/src/environment/mars_environment/mars_environment.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ libdir=${prefix}/lib -includedir=${prefix}/include/bolero/@PROJECT_NAME@ +includedir=${prefix}/include/ Name: @PROJECT_NAME@ Description: @PROJECT_DESCRIPTION@ From cac722f51a751871ca0694bf48a9d8583b0dc802 Mon Sep 17 00:00:00 2001 From: Moritz Schilling Date: Fri, 17 Sep 2021 10:04:21 +0200 Subject: [PATCH 2/3] Fix cython call Signed-off-by: Moritz Schilling --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 836e1b0a..7c7aa757 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ message(STATUS "Python version: ${PYTHON_VERSION}") execute_process( -COMMAND ${CYTHON} -${PYTHON_VERSION} bolero/utils/_ranking_svm.pyx +COMMAND ${CYTHON}${PYTHON_VERSION} bolero/utils/_ranking_svm.pyx WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) set(SETUP_PY "${CMAKE_CURRENT_SOURCE_DIR}/setup.py") From 0f98f2b149338406de825f7fee56797f118e0847 Mon Sep 17 00:00:00 2001 From: Thomas Roehr Date: Tue, 21 Sep 2021 10:47:38 +0200 Subject: [PATCH 3/3] Fix bolero include path Otherwise #include will only accidentially work --- include/bolero.pc.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/bolero.pc.in b/include/bolero.pc.in index 2b5fa88e..b29d8031 100644 --- a/include/bolero.pc.in +++ b/include/bolero.pc.in @@ -2,8 +2,9 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ libdir=${prefix}/lib includedir=${prefix}/include/@PROJECT_NAME@ +includedir2=${prefix}/include Name: @PROJECT_NAME@ Description: @PROJECT_DESCRIPTION@ Version: @PROJECT_VERSION@ -Cflags: -I${includedir} +Cflags: -I${includedir} -I${includedir2}