Update to 0.0.13 upstream release
- Resolves: rhbz#2298525 Upstream tag: 0.0.13 Upstream commit: bcdea2a7 Commit authored by Packit automation (https://packit.dev/)
This commit is contained in:
parent
138d180bc3
commit
6437b5a42c
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/cascadio-0.0.12.tar.gz
|
||||
/cascadio-0.0.13.tar.gz
|
||||
|
60
7.patch
60
7.patch
@ -1,60 +0,0 @@
|
||||
From de2510fed8f6e2a5c297aef35b08d55534067417 Mon Sep 17 00:00:00 2001
|
||||
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
|
||||
Date: Thu, 28 Mar 2024 15:24:28 -0400
|
||||
Subject: [PATCH] Add a SYSTEM_OPENCASCADE CMake option for using an external
|
||||
OpenCASCADE
|
||||
|
||||
---
|
||||
CMakeLists.txt | 36 ++++++++++++++++++++++--------------
|
||||
1 file changed, 22 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 90cdbf9..72f5816 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -20,23 +20,31 @@ pybind11_add_module(cascadio src/main.cpp)
|
||||
target_compile_definitions(cascadio
|
||||
PRIVATE VERSION_INFO=${PROJECT_VERSION})
|
||||
|
||||
+option(SYSTEM_OPENCASCADE "Use an external/system copy of OpenCASCADE" OFF)
|
||||
+
|
||||
# Set the C++ standard to C++11
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
|
||||
-# Set path to header files directories
|
||||
-target_include_directories(cascadio PUBLIC
|
||||
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/include/opencascade>
|
||||
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/inc>)
|
||||
-
|
||||
-# Set path to executable directories
|
||||
-target_link_directories(
|
||||
- cascadio PUBLIC
|
||||
- "${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/win64/gcc/lib"
|
||||
- "${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/win64/vc14/lib"
|
||||
- "${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/lin64/gcc/lib"
|
||||
- "${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/lin32/gcc/lib"
|
||||
- "${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/mac64/clang/lib"
|
||||
-)
|
||||
+if(SYSTEM_OPENCASCADE)
|
||||
+ find_package(OpenCASCADE CONFIG REQUIRED)
|
||||
+ # Set path to header files directories
|
||||
+ target_include_directories(cascadio PUBLIC "${OpenCASCADE_INCLUDE_DIR}")
|
||||
+else()
|
||||
+ # Set path to header files directories
|
||||
+ target_include_directories(cascadio PUBLIC
|
||||
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/include/opencascade>
|
||||
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/inc>)
|
||||
+
|
||||
+ # Set path to executable directories
|
||||
+ target_link_directories(
|
||||
+ cascadio PUBLIC
|
||||
+ "${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/win64/gcc/lib"
|
||||
+ "${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/win64/vc14/lib"
|
||||
+ "${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/lin64/gcc/lib"
|
||||
+ "${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/lin32/gcc/lib"
|
||||
+ "${CMAKE_CURRENT_SOURCE_DIR}/upstream/OCCT/mac64/clang/lib"
|
||||
+ )
|
||||
+endif()
|
||||
|
||||
# Add all possible libraries we might need
|
||||
target_link_libraries(cascadio PRIVATE
|
3
README.packit
Normal file
3
README.packit
Normal file
@ -0,0 +1,3 @@
|
||||
This repository is maintained by packit.
|
||||
https://packit.dev/
|
||||
The file was generated using packit 0.99.0.post1.dev3+g7c61c94b.
|
@ -3,7 +3,7 @@
|
||||
%bcond tests %{without bootstrap}
|
||||
|
||||
Name: python-cascadio
|
||||
Version: 0.0.12
|
||||
Version: 0.0.13
|
||||
Release: %autorelease
|
||||
Summary: Convert STEP files to GLB using OpenCASCADE
|
||||
|
||||
@ -12,10 +12,6 @@ URL: https://github.com/mikedh/cascadio
|
||||
# The PyPI project does not have sdists, so we must use the GitHub archive.
|
||||
Source: %{url}/archive/%{version}/cascadio-%{version}.tar.gz
|
||||
|
||||
# Add a SYSTEM_OPENCASCADE CMake option for using an external OpenCASCADE
|
||||
# https://github.com/trimesh/cascadio/pull/7
|
||||
Patch: %{url}/pull/7.patch
|
||||
|
||||
# Tests for cascadio fail on s390x, wrong endianness
|
||||
# https://github.com/mikedh/trimesh/issues/2251
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2298452
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cascadio-0.0.12.tar.gz) = 052a7e05112ec61e5670e5930180556f69163624142050839568618c0a2d3ce2eec720410f3136bb76375e6bea0cc1a9f491b3890d29c3fbe146703d733fc1a0
|
||||
SHA512 (cascadio-0.0.13.tar.gz) = 41bdad4b7b8ac4087955189f10226faba1a9c6b2b8fe1d66211c256b2c14bb2fee1f97ee52dd3bf711ad7fa8be021de09517853cdc24558e00480f772cac624b
|
||||
|
Loading…
Reference in New Issue
Block a user