From c0a73cf7f499dd3585bb9161911a0435b4463b7d Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Tue, 14 Apr 2020 09:09:07 +0100 Subject: [PATCH] Switch freecad.spec from OCE to opencascade (OCCT) Signed-off-by: Przemo Firszt --- package/fedora/freecad.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/package/fedora/freecad.spec b/package/fedora/freecad.spec index 837a82381e..396b63e695 100644 --- a/package/fedora/freecad.spec +++ b/package/fedora/freecad.spec @@ -10,8 +10,6 @@ %global plugins Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web PartDesignGui _PartDesign Path PathGui Spreadsheet SpreadsheetGui area DraftUtils DraftUtils libDriver libDriverDAT libDriverSTL libDriverUNV libMEFISTO2 libSMDS libSMESH libSMESHDS libStdMeshers Measure TechDraw TechDrawGui libarea-native Surface SurfaceGui PathSimulator # Some configuration options for other environments -# rpmbuild --with=occ: Compile using OpenCASCADE instead of OCE -%global occ %{?_with_occ: 1} %{?!_with_occ: 0} # rpmbuild --with=bundled_zipios: use bundled version of zipios++ %global bundled_zipios %{?_with_bundled_zipios: 1} %{?!_with_bundled_zipios: 0} # rpmbuild --without=bundled_pycxx: don't use bundled version of pycxx @@ -50,13 +48,7 @@ BuildRequires: git BuildRequires: Coin3-devel BuildRequires: Inventor-devel -%if %{occ} -BuildRequires: OpenCASCADE-devel -%else -BuildRequires: OCE-devel -BuildRequires: OCE-draw -%endif - +BuildRequires: opencascade-devel BuildRequires: boost-devel BuildRequires: boost-python3-devel BuildRequires: eigen3-devel @@ -210,9 +202,7 @@ LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS -DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin3 \ -DCOIN3D_DOC_PATH=%{_datadir}/Coin3/Coin \ -DFREECAD_USE_EXTERNAL_PIVY=TRUE \ -%if %{occ} -DUSE_OCC=TRUE \ -%endif %if ! %{bundled_smesh} -DFREECAD_USE_EXTERNAL_SMESH=TRUE \ -DSMESH_FOUND=TRUE \