| win_64 |
@@ -178,4 +196,5 @@ In order to produce a uniquely identifiable distribution:
Feedstock Maintainers
=====================
+* [@baszalmstra](https://github.com/baszalmstra/)
diff --git a/build-locally.py b/build-locally.py
index d78427b..6788aea 100755
--- a/build-locally.py
+++ b/build-locally.py
@@ -1,8 +1,11 @@
-#!/usr/bin/env python3
+#!/bin/sh
+"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on
#
# This file has been generated by conda-smithy in order to build the recipe
# locally.
#
+# The line above this comment is a bash / sh / zsh guard
+# to stop people from running it with the wrong interpreter
import glob
import os
import platform
diff --git a/conda-forge.yml b/conda-forge.yml
index ff8c453..7a8b3a7 100644
--- a/conda-forge.yml
+++ b/conda-forge.yml
@@ -1,3 +1,6 @@
+build_platform:
+ linux_aarch64: linux_64
+ osx_arm64: osx_64
conda_build_tool: rattler-build
github:
branch_name: main
diff --git a/recipe/patches/001-use-gnuinstalldirs.patch b/recipe/patches/001-use-gnuinstalldirs.patch
new file mode 100644
index 0000000..f31064e
--- /dev/null
+++ b/recipe/patches/001-use-gnuinstalldirs.patch
@@ -0,0 +1,43 @@
+From 1f45f8a3f49e778aed940326e9abf0ea89b8aa1c Mon Sep 17 00:00:00 2001
+From: Bas Zalmstra
+Date: Tue, 1 Oct 2024 15:01:26 +0200
+Subject: [PATCH] use gnu install dirs
+
+---
+ Build/CMakeLists.txt | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Build/CMakeLists.txt b/Build/CMakeLists.txt
+index bf40d940a..922dd68f1 100644
+--- a/Build/CMakeLists.txt
++++ b/Build/CMakeLists.txt
+@@ -282,14 +282,18 @@ endif()
+
+ # Install Jolt library and includes
+ if (ENABLE_INSTALL)
++ include(GNUInstallDirs)
+ install(TARGETS Jolt
+ EXPORT JoltExport
+- DESTINATION lib)
++ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ foreach(SRC_FILE ${JOLT_PHYSICS_SRC_FILES})
+ string(REPLACE ${PHYSICS_REPO_ROOT} "" RELATIVE_SRC_FILE ${SRC_FILE})
+ get_filename_component(DESTINATION_PATH ${RELATIVE_SRC_FILE} DIRECTORY)
+ if (NOT RELATIVE_SRC_FILE MATCHES "\.cpp")
+- install(FILES ${SRC_FILE} DESTINATION include/${DESTINATION_PATH})
++ install(FILES ${SRC_FILE} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${DESTINATION_PATH})
+ endif()
+ endforeach()
+
+@@ -298,7 +302,7 @@ if (ENABLE_INSTALL)
+ NAMESPACE Jolt::
+ FILE JoltConfig.cmake)
+ install(EXPORT JoltExport
+- DESTINATION lib/cmake/Jolt/
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Jolt/
+ NAMESPACE Jolt::
+ FILE JoltConfig.cmake)
+ endif()
diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml
index 2d28ee3..f2167fb 100644
--- a/recipe/recipe.yaml
+++ b/recipe/recipe.yaml
@@ -8,13 +8,8 @@ package:
source:
url: https://github.com/jrouwe/JoltPhysics/archive/refs/tags/v${{ version }}.zip
sha256: 10fcc863ae2b9d48c2f22d8b0204034820e57a55f858b7c388ac9579d8cf4095
-
-requirements:
- build:
- - ${{ compiler("cxx") }}
- - ${{ stdlib("c") }}
- - cmake
- - ninja
+ patches:
+ - patches/001-use-gnuinstalldirs.patch
build:
number: 0
@@ -49,6 +44,20 @@ build:
-S $SRC_DIR/Build
cmake --build . --target install
+requirements:
+ build:
+ - ${{ compiler("cxx") }}
+ - ${{ stdlib("c") }}
+ - cmake
+ - ninja
+
+tests:
+ - package_contents:
+ include:
+ - Jolt/Jolt.h
+ lib:
+ - Jolt
+
about:
homepage: https://github.com/jrouwe/JoltPhysics
license: MIT
|