From debc10248d80d9fda6156d3e33625e4dcf803781 Mon Sep 17 00:00:00 2001 From: boxanm Date: Tue, 7 May 2024 19:14:55 -0400 Subject: [PATCH 1/3] Set minimum libnabo version in CMakeLists.txt --- CMakeLists.txt | 2 +- pointmatcher/MatchersImpl.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0acebe37..00bdfdbe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,7 @@ include_directories(SYSTEM "${EIGEN_INCLUDE_DIR}") #-------------------- if (NOT TARGET nabo) # Find libnabo: - find_package(libnabo REQUIRED PATHS ${LIBNABO_INSTALL_DIR}) + find_package(libnabo 1.1.1 REQUIRED PATHS ${LIBNABO_INSTALL_DIR}) if (TARGET libnabo::nabo) set(libnabo_LIBRARIES libnabo::nabo) message(STATUS "libnabo found, version ${libnabo_VERSION} (Config mode, libs=${libnabo_LIBRARIES})") diff --git a/pointmatcher/MatchersImpl.h b/pointmatcher/MatchersImpl.h index 93f9fcbb..3cbf9c79 100644 --- a/pointmatcher/MatchersImpl.h +++ b/pointmatcher/MatchersImpl.h @@ -39,9 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "PointMatcher.h" #include "nabo/nabo.h" -#if NABO_VERSION_INT < 10007 - #error "You need libnabo version 1.0.7 or greater" -#endif template struct MatchersImpl From 5e7c927e15225a08074f15356fe73792e52c2e01 Mon Sep 17 00:00:00 2001 From: boxanm Date: Tue, 7 May 2024 19:23:31 -0400 Subject: [PATCH 2/3] Update libnabo version in Python workflow --- .github/workflows/build-python.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-python.yaml b/.github/workflows/build-python.yaml index b12c5d27..e7f9e3bd 100644 --- a/.github/workflows/build-python.yaml +++ b/.github/workflows/build-python.yaml @@ -13,7 +13,7 @@ env: BOOST_MAJOR_VERSION: '1' BOOST_MINOR_VERSION: '80' BOOST_PATCH_VERSION: '0' - LIBNABO_VERSION: '1.0.7' + LIBNABO_VERSION: '1.1.1' PYBIND11_VERSION: 'v2.10.2' BOOST_INSTALL_PATH: ${{ github.workspace }}/.tmp/boost/install BOOST_SRC_DIR: ${{ github.workspace }}/.tmp/boost From 6dca06dba8a683978040851af31532adbea162a1 Mon Sep 17 00:00:00 2001 From: boxanm Date: Mon, 27 May 2024 11:25:33 -0400 Subject: [PATCH 3/3] Update libnabo version to the newest release --- .github/workflows/build-python.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-python.yaml b/.github/workflows/build-python.yaml index e7f9e3bd..2d5bcc3a 100644 --- a/.github/workflows/build-python.yaml +++ b/.github/workflows/build-python.yaml @@ -13,7 +13,7 @@ env: BOOST_MAJOR_VERSION: '1' BOOST_MINOR_VERSION: '80' BOOST_PATCH_VERSION: '0' - LIBNABO_VERSION: '1.1.1' + LIBNABO_VERSION: '1.1.2' PYBIND11_VERSION: 'v2.10.2' BOOST_INSTALL_PATH: ${{ github.workspace }}/.tmp/boost/install BOOST_SRC_DIR: ${{ github.workspace }}/.tmp/boost