Merge pull request #85 from traversaro/vtk931

Rebuild for vtk 9.3.1 and stop using cdt
conda-forge · Sep 22, 2024 · 9a99ca8 · 9a99ca8
2 parents 1fa18b2 + 4d4d038
commit 9a99ca8
Show file tree

Hide file tree

Showing 14 changed files with 107 additions and 57 deletions.
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -59,7 +59,7 @@ spdlog:
 target_platform:
 - linux-64
 vtk_base:
-- 9.3.0
+- 9.3.1
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -26,8 +26,6 @@ fmt:
 - '11'
 idyntree:
 - '13'
-libboost_devel:
-- '1.86'
 libmatio_cpp:
 - 0.2.5
 libopencv:
@@ -36,38 +34,18 @@ libosqp:
 - 0.6.3
 libyarp:
 - 3.9.0
-numpy:
-- '1.22'
-- '1.23'
-- '1.26'
-- '1.22'
 pcl:
 - 1.14.1
-pin_run_as_build:
-  python:
-    min_pin: x.x
-    max_pin: x.x
-pugixml:
-- '1.14'
-pybind11_abi:
-- '4'
-python:
-- 3.10.* *_cpython
-- 3.11.* *_cpython
-- 3.12.* *_cpython
-- 3.9.* *_cpython
 qhull:
 - '2020.2'
 spdlog:
 - '1.14'
 target_platform:
 - linux-aarch64
 vtk_base:
-- 9.3.0
+- 9.3.1
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
 - - c_stdlib_version
   - cdt_name
-- - python
-  - numpy
diff --git a/.ci_support/migrations/idyntree13.yaml b/.ci_support/migrations/idyntree13.yaml
diff --git a/.ci_support/migrations/vtk931.yaml b/.ci_support/migrations/vtk931.yaml
@@ -0,0 +1,10 @@
+__migrator:
+  build_number: 1
+  kind: version
+  commit_message: "Rebuild for vtk 9.3.1"
+  migration_number: 1
+migrator_ts: 1726738929.969102
+vtk_base:
+- 9.3.1
+vtk:
+- 9.3.1
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -61,7 +61,7 @@ spdlog:
 target_platform:
 - osx-64
 vtk_base:
-- 9.3.0
+- 9.3.1
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -61,7 +61,7 @@ spdlog:
 target_platform:
 - osx-arm64
 vtk_base:
-- 9.3.0
+- 9.3.1
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -49,7 +49,7 @@ spdlog:
 target_platform:
 - win-64
 vtk_base:
-- 9.3.0
+- 9.3.1
 zip_keys:
 - - python
   - numpy
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/891.patch b/recipe/891.patch
@@ -0,0 +1,73 @@
+From 82d62d26d5a7f3d17731f4c6471f5de08ca387a3 Mon Sep 17 00:00:00 2001
+From: Silvio Traversaro <[email protected]>
+Date: Fri, 20 Sep 2024 16:51:26 +0200
+Subject: [PATCH] Add USE_SYSTEM_tiny-process-library option to use
+ tiny-process-library found in system
+
+---
+ devices/YarpRobotLoggerDevice/CMakeLists.txt | 43 +++++++++++---------
+ 1 file changed, 23 insertions(+), 20 deletions(-)
+
+diff --git a/devices/YarpRobotLoggerDevice/CMakeLists.txt b/devices/YarpRobotLoggerDevice/CMakeLists.txt
+index 38844d6a23..6f05fd5074 100644
+--- a/devices/YarpRobotLoggerDevice/CMakeLists.txt
++++ b/devices/YarpRobotLoggerDevice/CMakeLists.txt
+@@ -3,35 +3,38 @@
+ # BSD-3-Clause license.
+
+ if(FRAMEWORK_COMPILE_YarpRobotLoggerDevice)
+-  # Warning: the <package> option of yarp_configure_plugins_installation should be different from the plugin name
+-
++  option(USE_SYSTEM_tiny-process-library "Use system tiny-process-library" OFF)
+
+-  include(FetchContent)
+-  FetchContent_Declare(tiny_process_library
+-    GIT_REPOSITORY https://gitlab.com/eidheim/tiny-process-library.git
+-    GIT_TAG v2.0.4)
++  if(USE_SYSTEM_tiny-process-library)
++    find_package(tiny-process-library REQUIRED)
++  else()
++    include(FetchContent)
++    FetchContent_Declare(tiny_process_library
++      GIT_REPOSITORY https://gitlab.com/eidheim/tiny-process-library.git
++      GIT_TAG v2.0.4)
+
+-  if(NOT tiny_process_library_POPULATED)
+-    FetchContent_Populate(tiny_process_library)
++    if(NOT tiny_process_library_POPULATED)
++      FetchContent_Populate(tiny_process_library)
+
+-    set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS})
+-    set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Build libraries as shared as opposed to static")
++      set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS})
++      set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Build libraries as shared as opposed to static")
+
+-    set(BUILD_TESTING_OLD ${BUILD_TESTING})
+-    set(BUILD_TESTING OFF CACHE INTERNAL "Create tests using CMake")
++      set(BUILD_TESTING_OLD ${BUILD_TESTING})
++      set(BUILD_TESTING OFF CACHE INTERNAL "Create tests using CMake")
+
+-    # Bring the populated content into the build
+-    add_subdirectory(${tiny_process_library_SOURCE_DIR} ${tiny_process_library_BINARY_DIR})
++      # Bring the populated content into the build
++      add_subdirectory(${tiny_process_library_SOURCE_DIR} ${tiny_process_library_BINARY_DIR})
+
+-    # Restore the old value of the parameter
+-    set(BUILD_TESTING ${BUILD_TESTING_OLD} CACHE BOOL
+-      "Create tests using CMake" FORCE)
++      # Restore the old value of the parameter
++      set(BUILD_TESTING ${BUILD_TESTING_OLD} CACHE BOOL
++        "Create tests using CMake" FORCE)
+
+-    set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE BOOL
+-      "Build libraries as shared as opposed to static" FORCE)
++      set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE BOOL
++        "Build libraries as shared as opposed to static" FORCE)
++    endif()
+   endif()
+
+-
++  # Warning: the <package> option of yarp_configure_plugins_installation should be different from the plugin name
+   add_bipedal_yarp_device(
+     NAME YarpRobotLoggerDevice
+     TYPE BipedalLocomotion::YarpRobotLoggerDevice
diff --git a/recipe/bld_cxx.bat b/recipe/bld_cxx.bat
@@ -19,6 +19,7 @@ cmake -G "Ninja" ^
     -DFRAMEWORK_USE_PCL:BOOL=ON ^
     -DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=OFF ^
     -DUSE_SYSTEM_Catch2:BOOL=ON ^
+    -DUSE_SYSTEM_tiny-process-library:BOOL=ON ^
     %SRC_DIR%
 if errorlevel 1 exit 1
 

diff --git a/recipe/build_cxx.sh b/recipe/build_cxx.sh
@@ -35,6 +35,7 @@ cmake ${CMAKE_ARGS} -GNinja .. \
     -DFRAMEWORK_USE_tomlplusplus:BOOL=ON \
     -DFRAMEWORK_USE_PCL:BOOL=ON \
     -DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=OFF \
+    -DUSE_SYSTEM_tiny-process-library:BOOL=ON \
     -DUSE_SYSTEM_Catch2:BOOL=ON
 
 cat CMakeCache.txt

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -13,9 +13,10 @@ source:
   url: https://github.com/ami-iit/bipedal-locomotion-framework/archive/refs/tags/v{{ version }}.tar.gz
   sha256: 0366fb751aaac0ec0a2cb8ef6d56af4527b822b80d104d747f9c1c1f77718282
   patches:
+    - 891.patch
 
 build:
-  number: 2
+  number: 3
 
 outputs:
   # {{ namecxx }}
@@ -36,12 +37,6 @@ outputs:
         - cmake==3.29.0
         - pkg-config
         - ninja
-        - {{ cdt('mesa-libgl-devel') }}  # [linux]
-        - {{ cdt('mesa-dri-drivers') }}  # [linux]
-        - {{ cdt('libselinux') }}  # [linux]
-        - {{ cdt('libxdamage') }}  # [linux]
-        - {{ cdt('libxxf86vm') }}  # [linux]
-        - {{ cdt('libxext') }}     # [linux]
         # YARP idl tools are used in this recipe
         - libyarp  # [build_platform != target_platform]
         # PCL requires Qt's tools
@@ -67,6 +62,8 @@ outputs:
         - libopencv
         - pcl
         - onnxruntime-cpp
+        - tiny-process-library
+        - libgl-devel  # [linux]
         # Only required for testing
         - catch2
         # transitive public dependency of pcl
@@ -84,6 +81,8 @@ outputs:
         - eigen
         - liblie-group-controllers
         - tomlplusplus
+        # Workaround for https://github.com/conda-forge/pcl-feedstock/pull/68
+        - vtk-base * qt*  # [not win]
 
     test:
       commands:
@@ -103,6 +102,8 @@ outputs:
       # icub-models is used just for tests, we do not actually link the C++ library
       ignore_run_exports:
         - icub-models
+      # Workaround for https://github.com/conda-forge/bipedal-locomotion-framework-feedstock/pull/85#issuecomment-2364616366
+      skip: True              # [aarch64]
     requirements:
       build:
         - {{ compiler('c') }}
@@ -116,12 +117,6 @@ outputs:
         - cross-python_{{ target_platform }}     # [build_platform != target_platform]
         - pybind11                               # [build_platform != target_platform]
         - pybind11-abi                           # [build_platform != target_platform]
-        - {{ cdt('mesa-libgl-devel') }}  # [linux]
-        - {{ cdt('mesa-dri-drivers') }}  # [linux]
-        - {{ cdt('libselinux') }}  # [linux]
-        - {{ cdt('libxdamage') }}  # [linux]
-        - {{ cdt('libxxf86vm') }}  # [linux]
-        - {{ cdt('libxext') }}     # [linux]
         # PCL requires Qt's tools
         - qt6-main  # [build_platform != target_platform and not ppc64le]
       host:
@@ -144,14 +139,13 @@ outputs:
         - libboost-devel
         - pugixml
         - pcl
+        - libgl-devel  # [linux]
         - xorg-libxfixes  # [linux]
         - icub-models # Requested just for tests
         - scipy # Requested just for tests
         - pytest # Requested just for tests
         - manifpy # Requested just for tests
         - numpy
-        # Workaround for https://github.com/conda-forge/pcl-feedstock/pull/68
-        - vtk-base * qt*  # [not win]
       run:
         - {{ pin_subpackage(namecxx, exact=True) }}
         - python
@@ -171,9 +165,12 @@ outputs:
     build:
       run_exports:
         - {{ pin_subpackage(namecxx, max_pin='x.x.x') }}
+      # Workaround for https://github.com/conda-forge/bipedal-locomotion-framework-feedstock/pull/85#issuecomment-2364616366
+      skip: True              # [aarch64]
     requirements:
       run:
         - {{ pin_subpackage(namecxx, exact=True) }}
+        # Workaround for       # Workaround for https://github.com/conda-forge/bipedal-locomotion-framework-feedstock/pull/85#issuecomment-2364616366
         - {{ pin_subpackage(namepython, max_pin='x.x.x') }}
     test:
       imports:
@@ -195,7 +192,6 @@ outputs:
         - bipedal_locomotion_framework.bindings.tsid
         - bipedal_locomotion_framework.bindings.yarp_utilities
 
-
 about:
   home: https://github.com/ami-iit/bipedal-locomotion-framework
   license: BSD-3-Clause