opencascade-7.6.3

2022-07-30 01:34:48 +03:00
parent d17f33a7f5
commit 3942711945
7 changed files with 1 additions and 37 deletions
@@ -0,0 +1,12 @@
+diff -up oce-upstream-V7_5_0/src/Standard/Standard_Type.hxx.omv~ oce-upstream-V7_5_0/src/Standard/Standard_Type.hxx
+--- oce-upstream-V7_5_0/src/Standard/Standard_Type.hxx.omv~	2022-01-09 01:03:31.512273977 +0100
+++ oce-upstream-V7_5_0/src/Standard/Standard_Type.hxx	2022-01-09 01:03:38.866283692 +0100
+@@ -26,7 +26,7 @@
+ // DEFINE_STANDARD_RTTI* macro is actually a base class.
+ #if ! defined(OCCT_CHECK_BASE_CLASS)
+ 
+-#if (defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || (__GNUC__ > 4)))
+#if (defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || (__GNUC__ > 4))) && !defined(__clang__)
+ 
+ // For GCC 4.7+, more strict check is possible -- ensuring that base class 
+ // is direct base -- using non-standard C++ reflection functionality.
@@ -0,0 +1,53 @@
+From: kgv <kgv@opencascade.com>
+Date: Mon, 29 Nov 2021 18:26:45 +0000 (+0300)
+Subject: 0032697: Configuration - fix compilation errors with oneTBB 2021
+X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=740833a6a88e481f474783c426b6f6311ed586d3
+
+0032697: Configuration - fix compilation errors with oneTBB 2021
+
+Removed usage of no more existing tbb::task_scheduler_init and tbb::captured_exception.
+---
+
+diff --git a/src/OSD/OSD_Parallel_TBB.cxx b/src/OSD/OSD_Parallel_TBB.cxx
+index 2344a6ca2d..0b9022b576 100644
+--- a/src/OSD/OSD_Parallel_TBB.cxx
+++ b/src/OSD/OSD_Parallel_TBB.cxx
+@@ -25,7 +25,9 @@ Standard_DISABLE_DEPRECATION_WARNINGS
+ #include <tbb/parallel_for.h>
+ #include <tbb/parallel_for_each.h>
+ #include <tbb/blocked_range.h>
+-#include <tbb/task_scheduler_init.h>
+#if TBB_VERSION_MAJOR < 2021
+  #include <tbb/task_scheduler_init.h>
+#endif
+ Standard_ENABLE_DEPRECATION_WARNINGS
+ 
+ //=======================================================================
+@@ -38,12 +40,16 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
+                                     const FunctorInterface& theFunctor,
+                                     Standard_Integer theNbItems)
+ {
+#if TBB_VERSION_MAJOR >= 2021
+  // task_scheduler_init is removed,
+  // exceptions are captured without proxy tbb::captured_exception object
+  (void )theNbItems;
+  tbb::parallel_for_each (theBegin, theEnd, theFunctor);
+#else
+   try
+   {
+     const Handle(OSD_ThreadPool)& aThreadPool = OSD_ThreadPool::DefaultPool();
+-    const Standard_Integer aNbThreads = theNbItems > 0 ?
+-      aThreadPool->NbDefaultThreadsToLaunch() : -1;
+-
+    const Standard_Integer aNbThreads = theNbItems > 0 ? aThreadPool->NbDefaultThreadsToLaunch() : -1;
+     tbb::task_scheduler_init aScheduler (aNbThreads);
+     tbb::parallel_for_each (theBegin, theEnd, theFunctor);
+   }
+@@ -51,6 +57,7 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
+   {
+     throw Standard_ProgramError (anException.what());
+   }
+#endif
+ }
+ 
+ #endif /* HAVE_TBB */
@@ -0,0 +1,12 @@
+diff -up opencascade-7.6.0/adm/templates/custom.build.sh.in.omv~ opencascade-7.6.0/adm/templates/custom.build.sh.in
+--- opencascade-7.6.0/adm/templates/custom.build.sh.in.omv~	2022-01-12 04:05:12.227180642 +0100
+++ opencascade-7.6.0/adm/templates/custom.build.sh.in	2022-01-12 04:06:30.088406684 +0100
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ 
+-if [ "$1" == "@BIN_LETTER@" ]; then
+if true; then
+   if [ "$2" == "@COMPILER_BITNESS@" ]; then
+     # set environment variables used by OCCT
+     export CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
+diff -up opencascade-7.6.0/adm/templates/env.sh.omv~ opencascade-7.6.0/adm/templates/env.sh
@@ -0,0 +1,26 @@
+--- a/adm/templates/OpenCASCADEConfig.cmake.in
+++ b/adm/templates/OpenCASCADEConfig.cmake.in
+@@ -27,7 +27,7 @@ get_filename_component (OpenCASCADE_INST
+ if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
+   get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+ endif()
+-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
+if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$" OR OpenCASCADE_INSTALL_PREFIX MATCHES "/lib64$")
+   get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+ endif()
+ if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$")
+--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
+@@ -244,9 +244,9 @@ else()
+ 
+   install (TARGETS ${PROJECT_NAME}
+            EXPORT OpenCASCADE${CURRENT_MODULE}Targets
+-           RUNTIME DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}"
+-           ARCHIVE DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
+-           LIBRARY DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}")
+           RUNTIME DESTINATION "${INSTALL_DIR_BIN}"
+           ARCHIVE DESTINATION "${INSTALL_DIR_LIB}"
+           LIBRARY DESTINATION "${INSTALL_DIR_LIB}")
+ 
+   if (NOT WIN32)
+     if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")