Merge pull request #46 from traversaro/enableaceosxarm64

Enable ACE dependency on osx-arm64
conda-forge · Jun 16, 2024 · a557db3 · a557db3
2 parents 957acff + bd501b8
commit a557db3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/recipe/build_cxx.sh b/recipe/build_cxx.sh
@@ -17,12 +17,6 @@ if [[ "${target_platform}" == osx-* ]]; then
     CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
 fi
 
-# On osx-arm64, we do not have ACE
-# See https://github.com/conda-forge/ace-feedstock/issues/29
-if [[ "${target_platform}" == "osx-arm64" ]]; then
-  export CMAKE_ARGS="${CMAKE_ARGS} -DSKIP_ACE:BOOL=ON"
-fi
-
 mkdir build
 cd build
 

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -18,7 +18,7 @@ source:
     - 3109bis.patch
 
 build:
-  number: 4
+  number: 5
 
 outputs:
   - name: {{ namecxx }}
@@ -49,7 +49,7 @@ outputs:
         - ycm-cmake-modules
 
       host:
-        - ace  # [not osx or not arm64]
+        - ace
         - tinyxml
         - eigen
         - sdl