summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-07-03 17:52:57 +0200
committerbartus2020-07-04 02:41:34 +0200
commit31c2ab65738d44ea36060945fd69a22198364d52 (patch)
tree3bc12597c950d6470434e930b79d554e8986c46b
parent1a8965d590b43d001abd547303b62f02740c8708 (diff)
downloadaur-31c2ab65738d44ea36060945fd69a22198364d52.tar.gz
Switch [community]/openscade to [AUR]/oce
* required cascade version <=7.2
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--opencascade.patch13
3 files changed, 8 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bed68d3e75a..5c4d2143a9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,7 +19,7 @@ pkgbase = chronoengine
makedepends = swig
makedepends = blaze
makedepends = cuda
- makedepends = opencascade
+ makedepends = oce
depends = openmpi
depends = boost-libs
optdepends = irrlicht: Runtime visualization with Irrlicht.
@@ -34,13 +34,11 @@ pkgbase = chronoengine
source = git+https://github.com/google/googletest.git
source = chronoengine.sh
source = glm.patch
- source = opencascade.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = 0fe883cfcc1db869d08235482a3801fa458db15360e0eefac9084c7f2993af4a
sha256sums = 4e8ed0097fb14bbe437c2a57e9ef1852fdbfe8675e5345b0af42287d24fbfefe
- sha256sums = bfe6cc1f8018eabc2998c76a12096ba26722c32b8f3244dbc23ec653a5cfe958
pkgname = chronoengine
diff --git a/PKGBUILD b/PKGBUILD
index 7199d2b4ed5..d4369ddf4e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,9 @@ makedepends=(cmake git boost glm glew glfw irrlicht glut openmpi)
makedepends+=(python swig) # -DENABLE_MODULE_PYTHON requirement
makedepends+=(blaze) # -DENABLE_MODULE_PARALLEL=ON requirement
makedepends+=(cuda) # -DENABLE_MODULE_PARALLEL=ON optional
-makedepends+=(opencascade) # -DENABLE_MODULE_CASCADE=ON required (version<=7.2)
+#makedepends+=(opencascade) # -DENABLE_MODULE_CASCADE=ON required (version<=7.2)
+ # use oce (opencascade comunitiy edition)
+makedepends+=(oce) # MODULE_CASCADE
#makedepends+=(intel-mkl) # -DENABLE_MODULE_MKL=ON requirement
optdepends=(
"irrlicht: Runtime visualization with Irrlicht."
@@ -31,22 +33,21 @@ source=("${pkgname}::git+https://github.com/projectchrono/chrono.git${_fragment}
"git+https://github.com/google/googletest.git"
"chronoengine.sh"
"glm.patch"
- "opencascade.patch"
)
sha256sums=('SKIP'
'SKIP'
'SKIP'
'0fe883cfcc1db869d08235482a3801fa458db15360e0eefac9084c7f2993af4a'
- '4e8ed0097fb14bbe437c2a57e9ef1852fdbfe8675e5345b0af42287d24fbfefe'
- 'bfe6cc1f8018eabc2998c76a12096ba26722c32b8f3244dbc23ec653a5cfe958')
+ '4e8ed0097fb14bbe437c2a57e9ef1852fdbfe8675e5345b0af42287d24fbfefe')
CMAKE_FLAGS=( -DENABLE_MODULE_POSTPROCESS=ON
-DENABLE_MODULE_VEHICLE=ON
-DENABLE_MODULE_FEA=ON
-DENABLE_MODULE_PYTHON=ON
-DENABLE_MODULE_IRRLICHT=ON
- -DENABLE_MODULE_CASCADE=OFF
- -DCH_CASCADE_DIR=/opt/opencascade7
+ -DENABLE_MODULE_CASCADE=ON
+ -DCASCADE_ROOT=/opt/oce
+ -DCASCADE_INCLUDE_DIR=/opt/oce/include/oce
-DENABLE_MODULE_OPENGL=ON
-DENABLE_MODULE_PARALLEL=ON
-DENABLE_MODULE_MKL=OFF
diff --git a/opencascade.patch b/opencascade.patch
deleted file mode 100644
index 6837cb7a654..00000000000
--- a/opencascade.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/chrono_cascade/CMakeLists.txt b/src/chrono_cascade/CMakeLists.txt
-index e74a18b5c..db8b1181c 100644
---- a/src/chrono_cascade/CMakeLists.txt
-+++ b/src/chrono_cascade/CMakeLists.txt
-@@ -57,7 +57,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- FILE(GLOB CH_CASCADE_LIBS "${CH_CASCADE_LIBDIR}/*.lib")
- ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- FIND_PATH(CH_CASCADE_INCLUDES Standard_Version.hxx
-- HINTS ${CH_CASCADE_INCLUDES} "${CH_CASCADE_DIR}/inc" "${CH_CASCADE_DIR}/include"
-+ HINTS ${CH_CASCADE_INCLUDES} "${CH_CASCADE_DIR}/inc" "${CH_CASCADE_DIR}/include/opencascade"
- PATHS
- /usr/include/oce
- /usr/local/include/oce