commit: fb7207a62d44b75adf86b98f8cfe103d2b858711
Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Wed Jan 28 21:47:03 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 21:48:07 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fb7207a6
Adding a CMAKE_PREFIX_PATH rather than patching FindOpenCascade.cmake
---
.../files/mantid-3.3.0-FindOpenCascade.patch | 84 ----------------------
sci-visualization/mantid/mantid-3.3.0.ebuild | 6 +-
2 files changed, 3 insertions(+), 87 deletions(-)
diff --git a/sci-visualization/mantid/files/mantid-3.3.0-FindOpenCascade.patch
b/sci-visualization/mantid/files/mantid-3.3.0-FindOpenCascade.patch
deleted file mode 100644
index 2c8f78d..0000000
--- a/sci-visualization/mantid/files/mantid-3.3.0-FindOpenCascade.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/Build/CMake/FindOpenCascade.cmake
b/Build/CMake/FindOpenCascade.cmake
-index aefa011..346678d 100644
---- a/Build/CMake/FindOpenCascade.cmake
-+++ b/Build/CMake/FindOpenCascade.cmake
-@@ -4,13 +4,6 @@
- # OPENCASCADE_FOUND If false, do not try to use OPENCASCADE
-
- find_path ( OPENCASCADE_INCLUDE_DIR Standard.hxx PATHS
-- /usr/include/opencascade
-- /usr/include/oce
-- /usr/local/include/opencascade
-- /usr/local/include/oce
-- /usr/local/inc
-- /opt/OpenCASCADE/inc
-- ${CMAKE_INCLUDE_PATH}/OpenCascade
- $ENV{CASROOT}/inc
- )
-
-@@ -18,50 +11,56 @@ if ( WIN32 )
- add_definitions ( -DWNT )
- endif ( WIN32 )
-
--set ( OC_REDHAT_RPM /opt/OpenCASCADE/lib64 )
-+find_path ( OPENCASCADE_LIBRARY_DIR libTKernel.so PATHS
-+ $ENV{CASROOT}/lib64
-+)
-+
- find_library ( OPENCASCADE_LIB_TKERNEL
- NAMES TKernel
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKBO
- NAMES TKBO
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKPRIM
- NAMES TKPrim
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKMESH
- NAMES TKMesh
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKBREP
- NAMES TKBRep
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKTOPALGO
- NAMES TKTopAlgo
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKMATH
- NAMES TKMath
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
- find_library ( OPENCASCADE_LIB_TKG2D
- NAMES TKG2d
-- PATHS ${OC_REDHAT_RPM}
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
-
- find_library ( OPENCASCADE_LIB_TKG3D
- NAMES TKG3d
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
-
- find_library ( OPENCASCADE_LIB_TKGEOMBASE
- NAMES TKGeomBase
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
-
- find_library ( OPENCASCADE_LIB_TKGEOMAlgo
- NAMES TKGeomAlgo
-+ PATHS ${OPENCASCADE_LIBRARY_DIR}
- )
-
- set ( OPENCASCADE_LIBRARIES
diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild
b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 1c6abbb..52d953f 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
FORTRAN_STANDARD=90
PYTHON_COMPAT=python2_7
-inherit eutils cmake-utils versionator python-single-r1
+inherit eutils cmake-utils versionator python-single-r1 multilib
MAJOR_PV=$(get_version_component_range 1-2)
@@ -55,8 +55,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}-Source"
src_prepare() {
- epatch "${FILESDIR}/${P}-FindOpenCascade.patch" \
- "${FILESDIR}/${P}-minigzip-OF.patch"
+ epatch "${FILESDIR}/${P}-minigzip-OF.patch"
}
src_configure() {
@@ -68,6 +67,7 @@ src_configure() {
$(cmake-utils_use_use tcmalloc TCMALLOC)
$(cmake-utils_use paraview MAKE_VATES)
$(cmake-utils_use_build test TESTING)
+ -DCMAKE_PREFIX_PATH="${CASROOT}"
)
cmake-utils_src_configure
}
