Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: rerender using new-conda-smithy #2

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
target_platform:
Expand Down
25 changes: 25 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
target_platform:
- linux-aarch64
zip_keys:
- - c_stdlib_version
- cdt_name
2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
Expand Down
20 changes: 20 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
- osx-arm64
1 change: 1 addition & 0 deletions .github/CODEOWNERS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 20 additions & 1 deletion README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
build_platform:
linux_aarch64: linux_64
osx_arm64: osx_64
conda_build_tool: rattler-build
github:
branch_name: main
Expand Down
43 changes: 43 additions & 0 deletions recipe/patches/001-use-gnuinstalldirs.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From 1f45f8a3f49e778aed940326e9abf0ea89b8aa1c Mon Sep 17 00:00:00 2001
From: Bas Zalmstra <zalmstra.bas@gmail.com>
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()
23 changes: 16 additions & 7 deletions recipe/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down