From fd05b5d60aeff710d711db4de1a6448919834577 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Thu, 15 Mar 2018 20:48:28 +0100 Subject: [PATCH] OpenCascade : new recipe (#2271) * OpenCascade : new recipe * Whitespace cleanup * Shorter string subtitution * Cleanup * Cleanup, license, url * License!!! * License rename --- .../licenses/Open CASCADE exception v1.0 | 10 + .../opencascade/opencascade-0.18.3.recipe | 198 ++++++++++++++ .../patches/opencascade-0.18.3.patchset | 244 ++++++++++++++++++ 3 files changed, 452 insertions(+) create mode 100644 sci-libs/opencascade/licenses/Open CASCADE exception v1.0 create mode 100644 sci-libs/opencascade/opencascade-0.18.3.recipe create mode 100644 sci-libs/opencascade/patches/opencascade-0.18.3.patchset diff --git a/sci-libs/opencascade/licenses/Open CASCADE exception v1.0 b/sci-libs/opencascade/licenses/Open CASCADE exception v1.0 new file mode 100644 index 000000000..263d14ef7 --- /dev/null +++ b/sci-libs/opencascade/licenses/Open CASCADE exception v1.0 @@ -0,0 +1,10 @@ +Open CASCADE exception (version 1.0) to GNU LGPL version 2.1. + +The object code (i.e. not a source) form of a "work that uses the Library" +can incorporate material from a header file that is part of the Library. +As a special exception to the GNU Lesser General Public License version 2.1, +you may distribute such object code incorporating material from header files +provided with the Open CASCADE Technology libraries (including code of CDL +generic classes) under terms of your choice, provided that you give +prominent notice in supporting documentation to this code that it makes use +of or is based on facilities provided by the Open CASCADE Technology software. diff --git a/sci-libs/opencascade/opencascade-0.18.3.recipe b/sci-libs/opencascade/opencascade-0.18.3.recipe new file mode 100644 index 000000000..4555abc5e --- /dev/null +++ b/sci-libs/opencascade/opencascade-0.18.3.recipe @@ -0,0 +1,198 @@ +SUMMARY="A C++ 3D modeling library" +DESCRIPTION="Open CASCADE Technology (OCCT) is an object-oriented C++ class \ +library designed for rapid production of sophisticated domain-specific \ +CAD/CAM/CAE applications." +HOMEPAGE="https://github.com/tpaviot/oce/" +COPYRIGHT="1993-1999 Matra Datavision + 1999-2014 OPEN CASCADE SAS" +LICENSE="GNU LGPL v2.1 + Open CASCADE exception v1.0" +REVISION="1" +SOURCE_URI="https://github.com/tpaviot/oce/archive/OCE-$portVersion.tar.gz" +CHECKSUM_SHA256="c553d6a7bf52f790abc3b6bb7a1e91a65947e92a426bb1a88a11960c31f0966c" +SOURCE_DIR="oce-OCE-$portVersion" +PATCHES="opencascade-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + +libVersion="11.0.0" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + +PROVIDES=" + opencascade$secondaryArchSuffix = $portVersion + lib:libFWOSPlugin$secondaryArchSuffix = $libVersionCompat + lib:libPTKernel$secondaryArchSuffix = $libVersionCompat + lib:libTKBinL$secondaryArchSuffix = $libVersionCompat + lib:libTKBO$secondaryArchSuffix = $libVersionCompat + lib:libTKBool$secondaryArchSuffix = $libVersionCompat + lib:libTKBRep$secondaryArchSuffix = $libVersionCompat + lib:libTKCDF$secondaryArchSuffix = $libVersionCompat + lib:libTKernel$secondaryArchSuffix = $libVersionCompat + lib:libTKFeat$secondaryArchSuffix = $libVersionCompat + lib:libTKFillet$secondaryArchSuffix = $libVersionCompat + lib:libTKG2d$secondaryArchSuffix = $libVersionCompat + lib:libTKG3d$secondaryArchSuffix = $libVersionCompat + lib:libTKGeomAlgo$secondaryArchSuffix = $libVersionCompat + lib:libTKGeomBase$secondaryArchSuffix = $libVersionCompat + lib:libTKHLR$secondaryArchSuffix = $libVersionCompat + lib:libTKIGES$secondaryArchSuffix = $libVersionCompat + lib:libTKLCAF$secondaryArchSuffix = $libVersionCompat + lib:libTKMath$secondaryArchSuffix = $libVersionCompat + lib:libTKMesh$secondaryArchSuffix = $libVersionCompat + lib:libTKOffset$secondaryArchSuffix = $libVersionCompat + lib:libTKPLCAF$secondaryArchSuffix = $libVersionCompat + lib:libTKPrim$secondaryArchSuffix = $libVersionCompat + lib:libTKPShape$secondaryArchSuffix = $libVersionCompat + lib:libTKShapeSchema$secondaryArchSuffix = $libVersionCompat + lib:libTKShHealing$secondaryArchSuffix = $libVersionCompat + lib:libTKStdLSchema$secondaryArchSuffix = $libVersionCompat + lib:libTKSTEP$secondaryArchSuffix = $libVersionCompat + lib:libTKSTEP209$secondaryArchSuffix = $libVersionCompat + lib:libTKSTEPAttr$secondaryArchSuffix = $libVersionCompat + lib:libTKSTEPBase$secondaryArchSuffix = $libVersionCompat + lib:libTKSTL$secondaryArchSuffix = $libVersionCompat + lib:libTKTObj$secondaryArchSuffix = $libVersionCompat + lib:libTKTopAlgo$secondaryArchSuffix = $libVersionCompat + lib:libTKXMesh$secondaryArchSuffix = $libVersionCompat + lib:libTKXmlL$secondaryArchSuffix = $libVersionCompat + lib:libTKXSBase$secondaryArchSuffix = $libVersionCompat + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libgomp$secondaryArchSuffix + " + +PROVIDES_devel=" + opencascade${secondaryArchSuffix}_devel = $portVersion + devel:libFWOSPlugin$secondaryArchSuffix = $libVersionCompat + devel:libPTKernel$secondaryArchSuffix = $libVersionCompat + devel:libTKBinL$secondaryArchSuffix = $libVersionCompat + devel:libTKBO$secondaryArchSuffix = $libVersionCompat + devel:libTKBool$secondaryArchSuffix = $libVersionCompat + devel:libTKBRep$secondaryArchSuffix = $libVersionCompat + devel:libTKCDF$secondaryArchSuffix = $libVersionCompat + devel:libTKernel$secondaryArchSuffix = $libVersionCompat + devel:libTKFeat$secondaryArchSuffix = $libVersionCompat + devel:libTKFillet$secondaryArchSuffix = $libVersionCompat + devel:libTKG2d$secondaryArchSuffix = $libVersionCompat + devel:libTKG3d$secondaryArchSuffix = $libVersionCompat + devel:libTKGeomAlgo$secondaryArchSuffix = $libVersionCompat + devel:libTKGeomBase$secondaryArchSuffix = $libVersionCompat + devel:libTKHLR$secondaryArchSuffix = $libVersionCompat + devel:libTKIGES$secondaryArchSuffix = $libVersionCompat + devel:libTKLCAF$secondaryArchSuffix = $libVersionCompat + devel:libTKMath$secondaryArchSuffix = $libVersionCompat + devel:libTKMesh$secondaryArchSuffix = $libVersionCompat + devel:libTKOffset$secondaryArchSuffix = $libVersionCompat + devel:libTKPLCAF$secondaryArchSuffix = $libVersionCompat + devel:libTKPrim$secondaryArchSuffix = $libVersionCompat + devel:libTKPShape$secondaryArchSuffix = $libVersionCompat + devel:libTKShapeSchema$secondaryArchSuffix = $libVersionCompat + devel:libTKShHealing$secondaryArchSuffix = $libVersionCompat + devel:libTKStdLSchema$secondaryArchSuffix = $libVersionCompat + devel:libTKSTEP$secondaryArchSuffix = $libVersionCompat + devel:libTKSTEP209$secondaryArchSuffix = $libVersionCompat + devel:libTKSTEPAttr$secondaryArchSuffix = $libVersionCompat + devel:libTKSTEPBase$secondaryArchSuffix = $libVersionCompat + devel:libTKSTL$secondaryArchSuffix = $libVersionCompat + devel:libTKTObj$secondaryArchSuffix = $libVersionCompat + devel:libTKTopAlgo$secondaryArchSuffix = $libVersionCompat + devel:libTKXMesh$secondaryArchSuffix = $libVersionCompat + devel:libTKXmlL$secondaryArchSuffix = $libVersionCompat + devel:libTKXSBase$secondaryArchSuffix = $libVersionCompat + " +REQUIRES_devel=" + opencascade$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libgomp$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:sed + " + +defineDebugInfoPackage opencascade$secondaryArchSuffix \ + "$libDir"/libFWOSPlugin.so.$libVersion \ + "$libDir"/libPTKernel.so.$libVersion \ + "$libDir"/libTKBinL.so.$libVersion \ + "$libDir"/libTKBO.so.$libVersion \ + "$libDir"/libTKBool.so.$libVersion \ + "$libDir"/libTKBRep.so.$libVersion \ + "$libDir"/libTKCDF.so.$libVersion \ + "$libDir"/libTKernel.so.$libVersion \ + "$libDir"/libTKFeat.so.$libVersion \ + "$libDir"/libTKFillet.so.$libVersion \ + "$libDir"/libTKG2d.so.$libVersion \ + "$libDir"/libTKG3d.so.$libVersion \ + "$libDir"/libTKGeomAlgo.so.$libVersion \ + "$libDir"/libTKGeomBase.so.$libVersion \ + "$libDir"/libTKHLR.so.$libVersion \ + "$libDir"/libTKIGES.so.$libVersion \ + "$libDir"/libTKLCAF.so.$libVersion \ + "$libDir"/libTKMath.so.$libVersion \ + "$libDir"/libTKMesh.so.$libVersion \ + "$libDir"/libTKOffset.so.$libVersion \ + "$libDir"/libTKPLCAF.so.$libVersion \ + "$libDir"/libTKPrim.so.$libVersion \ + "$libDir"/libTKPShape.so.$libVersion \ + "$libDir"/libTKShapeSchema.so.$libVersion \ + "$libDir"/libTKShHealing.so.$libVersion \ + "$libDir"/libTKStdLSchema.so.$libVersion \ + "$libDir"/libTKSTEP.so.$libVersion \ + "$libDir"/libTKSTEP209.so.$libVersion \ + "$libDir"/libTKSTEPAttr.so.$libVersion \ + "$libDir"/libTKSTEPBase.so.$libVersion \ + "$libDir"/libTKSTL.so.$libVersion \ + "$libDir"/libTKTObj.so.$libVersion \ + "$libDir"/libTKTopAlgo.so.$libVersion \ + "$libDir"/libTKXMesh.so.$libVersion \ + "$libDir"/libTKXmlL.so.$libVersion \ + "$libDir"/libTKXSBase.so.$libVersion + +BUILD() +{ + mkdir -p build && cd "$_" + + cmake .. \ + -DOCE_MULTITHREAD_LIBRARY=OPENMP \ + -DOCE_DISABLE_X11=ON \ + -DOCE_INSTALL_PREFIX=$prefix \ + -DOCE_INSTALL_LIB_DIR=$libDir \ + -DOCE_INSTALL_INCLUDE_DIR=$includeDir \ + -Wno-dev + + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + prepareInstalledDevelLibs libFWOSPlugin libPTKernel libTKBinL libTKBO \ + libTKBool libTKBRep libTKCDF libTKernel libTKFeat libTKFillet libTKG2d \ + libTKG3d libTKGeomAlgo libTKGeomBase libTKHLR libTKIGES libTKLCAF \ + libTKMath libTKMesh libTKOffset libTKPLCAF libTKPrim libTKPShape \ + libTKShapeSchema libTKShHealing libTKStdLSchema libTKSTEP libTKSTEP209 \ + libTKSTEPAttr libTKSTEPBase libTKSTL libTKTObj libTKTopAlgo libTKXMesh \ + libTKXmlL libTKXSBase + + fixPkgconfig + + packageEntries devel \ + $developDir \ + $libDir/cmake +} + +TEST() +{ + cd build + make test +} diff --git a/sci-libs/opencascade/patches/opencascade-0.18.3.patchset b/sci-libs/opencascade/patches/opencascade-0.18.3.patchset new file mode 100644 index 000000000..8f99d065e --- /dev/null +++ b/sci-libs/opencascade/patches/opencascade-0.18.3.patchset @@ -0,0 +1,244 @@ +From 838ef11dbc70e82650549a8ab19f1c96b8573177 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sat, 3 Mar 2018 19:51:08 +0100 +Subject: Basic Haiku support + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 092fd2f..d9ccb93 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -472,9 +472,9 @@ if(OCE_VISUALISATION) + endif(WIN32) + endif(OCE_WITH_FREEIMAGE) + +- if (NOT WIN32 AND NOT OCE_OSX_USE_COCOA) ++ if (NOT WIN32 AND NOT OCE_OSX_USE_COCOA AND NOT HAIKU) + find_package(X11 REQUIRED) +- endif(NOT WIN32 AND NOT OCE_OSX_USE_COCOA) ++ endif(NOT WIN32 AND NOT OCE_OSX_USE_COCOA AND NOT HAIKU) + + if (NOT APPLE OR OCE_OSX_USE_COCOA) + find_package(OpenGL REQUIRED) +@@ -716,6 +716,11 @@ if(UNIX) + # remark #981 "operands are evaluated in unspecified order", e.g. a = b() + c() + add_definitions("-diag-disable 383,522,858,981") + endif(INTEL) ++ if(HAIKU) ++ # Haiku networking resides in libnetwork ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lnetwork") ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lnetwork") ++ endif(HAIKU) + endif(APPLE) + add_definitions(-DHAVE_CONFIG_H -DCSFDB -DOCC_CONVERT_SIGNALS) + else(UNIX) +diff --git a/src/Aspect/Aspect_DisplayConnection.cxx b/src/Aspect/Aspect_DisplayConnection.cxx +index 72109bf..5eac74a 100644 +--- a/src/Aspect/Aspect_DisplayConnection.cxx ++++ b/src/Aspect/Aspect_DisplayConnection.cxx +@@ -25,7 +25,7 @@ IMPLEMENT_STANDARD_RTTIEXT(Aspect_DisplayConnection, Standard_Transient) + // ======================================================================= + Aspect_DisplayConnection::Aspect_DisplayConnection() + { +-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) ++#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) + OSD_Environment anEnv ("DISPLAY"); + myDisplayName = anEnv.Value(); + Init(); +@@ -38,7 +38,7 @@ Aspect_DisplayConnection::Aspect_DisplayConnection() + // ======================================================================= + Aspect_DisplayConnection::~Aspect_DisplayConnection() + { +-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) ++#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) + if (myDisplay != NULL) + { + XCloseDisplay (myDisplay); +@@ -46,7 +46,7 @@ Aspect_DisplayConnection::~Aspect_DisplayConnection() + #endif + } + +-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) ++#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) + // ======================================================================= + // function : Aspect_DisplayConnection + // purpose : +diff --git a/src/Aspect/Aspect_DisplayConnection.hxx b/src/Aspect/Aspect_DisplayConnection.hxx +index 624cbaf..16d9f28 100644 +--- a/src/Aspect/Aspect_DisplayConnection.hxx ++++ b/src/Aspect/Aspect_DisplayConnection.hxx +@@ -20,7 +20,7 @@ + #include + #include + +-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) ++#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) + #include + #endif + +@@ -39,7 +39,7 @@ public: + //! Destructor. Close opened connection. + Standard_EXPORT ~Aspect_DisplayConnection(); + +-#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) ++#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) + //! Constructor. Creates connection with display specified in theDisplayName. + //! Display name should be in format "hostname:number" or "hostname:number.screen_number", where: + //! hostname - Specifies the name of the host machine on which the display is physically attached. +diff --git a/src/InterfaceGraphic/InterfaceGraphic.hxx b/src/InterfaceGraphic/InterfaceGraphic.hxx +index 80ac333..8539a2c 100644 +--- a/src/InterfaceGraphic/InterfaceGraphic.hxx ++++ b/src/InterfaceGraphic/InterfaceGraphic.hxx +@@ -23,7 +23,7 @@ + #undef DrawText + #endif + +-#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) ++#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__HAIKU__) + + #include + +diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx +index e9a80d6..4e61ac3 100644 +--- a/src/OSD/OSD_signal.cxx ++++ b/src/OSD/OSD_signal.cxx +@@ -69,7 +69,7 @@ typedef void (* SIG_PFV) (int); + + #include + +-#if !defined(__ANDROID__) ++#if !defined(__ANDROID__) && !defined(__HAIKU__) + #include + #endif + +diff --git a/src/Standard/Standard_MMgrOpt.cxx b/src/Standard/Standard_MMgrOpt.cxx +index 51464ad..3ed0fa1 100644 +--- a/src/Standard/Standard_MMgrOpt.cxx ++++ b/src/Standard/Standard_MMgrOpt.cxx +@@ -25,6 +25,10 @@ + # include /* mmap() */ + #endif + ++#ifdef __HAIKU__ ++# include ++#endif ++ + #include + // + #if defined (__sun) || defined(SOLARIS) +diff --git a/src/Standard/Standard_Mutex.cxx b/src/Standard/Standard_Mutex.cxx +index cdf6498..9fd1182 100644 +--- a/src/Standard/Standard_Mutex.cxx ++++ b/src/Standard/Standard_Mutex.cxx +@@ -24,6 +24,10 @@ + #include + #include + ++#ifdef __HAIKU__ ++#include ++#endif ++ + //============================================= + // Standard_Mutex::Standard_Mutex + //============================================= +diff --git a/src/Standard/Standard_Mutex.hxx b/src/Standard/Standard_Mutex.hxx +index 22b8a03..5e81912 100644 +--- a/src/Standard/Standard_Mutex.hxx ++++ b/src/Standard/Standard_Mutex.hxx +@@ -24,7 +24,9 @@ + #include + #else + #include +- #include ++ #ifndef __HAIKU__ ++ #include ++ #endif + #include + #include + #endif +diff --git a/src/Xw/Xw_Window.cxx b/src/Xw/Xw_Window.cxx +index a24a3a0..10694c3 100644 +--- a/src/Xw/Xw_Window.cxx ++++ b/src/Xw/Xw_Window.cxx +@@ -15,7 +15,7 @@ + + #include + +-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) ++#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) + + #include + #include +diff --git a/src/Xw/Xw_Window.hxx b/src/Xw/Xw_Window.hxx +index 53f0c14..da04952 100644 +--- a/src/Xw/Xw_Window.hxx ++++ b/src/Xw/Xw_Window.hxx +@@ -16,7 +16,7 @@ + #ifndef _Xw_Window_H__ + #define _Xw_Window_H__ + +-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) ++#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) + + #include + +-- +2.16.2 + + +From 03827b0b856173e015a3eb4c60c729f7ce3a6253 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sun, 4 Mar 2018 08:22:15 +0100 +Subject: Data install path fix + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d9ccb93..6ff39cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -903,7 +903,11 @@ endif(NOT DEFINED OCE_INSTALL_SCRIPT_DIR) + # Data + if(NOT DEFINED OCE_INSTALL_DATA_DIR) + if(NOT MSVC) +- set(OCE_INSTALL_DATA_DIR share/oce-${OCE_VERSION}) ++ if(NOT HAIKU) ++ set(OCE_INSTALL_DATA_DIR share/oce-${OCE_VERSION}) ++ else () ++ set(OCE_INSTALL_DATA_DIR data/oce-${OCE_VERSION}) ++ endif(NOT HAIKU) + else () + set(OCE_INSTALL_DATA_DIR "share/oce") + endif(NOT MSVC) +-- +2.16.2 + + +From 98c143fbef94320aa5c68dd0340e3660edd5c7ab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sun, 4 Mar 2018 08:59:37 +0100 +Subject: Adjust .cmake install paths + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6ff39cb..6f7f871 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -931,8 +931,13 @@ if(NOT DEFINED OCE_INSTALL_CMAKE_DATA_DIR) + set(OCE_INSTALL_CMAKE_DATA_DIR + OCE.framework/Versions/${OCE_VERSION}/Resources) + else(APPLE) +- set(OCE_INSTALL_CMAKE_DATA_DIR +- lib${LIB_SUFFIX}/oce-${OCE_VERSION}) ++ if(NOT HAIKU) ++ set(OCE_INSTALL_CMAKE_DATA_DIR ++ lib${LIB_SUFFIX}/oce-${OCE_VERSION}) ++ else(NOT HAIKU) ++ set(OCE_INSTALL_CMAKE_DATA_DIR ++ lib${LIB_SUFFIX}/cmake) ++ endif(NOT HAIKU) + endif(APPLE) + endif(WIN32) + endif(NOT DEFINED OCE_INSTALL_CMAKE_DATA_DIR) +-- +2.16.2 +