From 9c6ed3579d4bd6b75aec9405620638b9629a2a45 Mon Sep 17 00:00:00 2001 From: jfa Date: Mon, 15 Jan 2024 13:31:55 +0000 Subject: [PATCH] Porting to OCCT 7.8.0 --- src/Basics/smIdType.hxx.in | 14 ++++++++++++++ src/ResourcesManager/CMakeLists.txt | 8 ++++---- src/SALOMELocalTrace/CMakeLists.txt | 1 - src/SALOMELocalTrace/Test/CMakeLists.txt | 4 ++-- src/SALOMETraceCollector/CMakeLists.txt | 7 +++---- src/SALOMETraceCollector/Test/CMakeLists.txt | 4 ++-- src/TOOLSDS/CMakeLists.txt | 8 ++++---- src/TestContainer/CMakeLists.txt | 6 +++--- src/TestMPIContainer/CMakeLists.txt | 6 +++--- src/UnitTests/CMakeLists.txt | 6 +++--- src/Utils/CMakeLists.txt | 10 +++++----- src/Utils/Test/CMakeLists.txt | 4 ++-- 12 files changed, 45 insertions(+), 33 deletions(-) diff --git a/src/Basics/smIdType.hxx.in b/src/Basics/smIdType.hxx.in index 4ad268d72..d1b3e9e61 100644 --- a/src/Basics/smIdType.hxx.in +++ b/src/Basics/smIdType.hxx.in @@ -25,7 +25,10 @@ #cmakedefine SALOME_USE_64BIT_IDS +#include "Basics_OCCTVersion.hxx" + #include +#include #include #ifndef SALOME_USE_64BIT_IDS @@ -36,6 +39,7 @@ typedef std::int64_t smIdType; struct smIdHasher { +#if OCC_VERSION_LARGE < 0x07080000 static int HashCode(const smIdType theValue, const int theUpperBound) { return static_cast ((theValue & std::numeric_limits::max()) % theUpperBound + 1); @@ -45,6 +49,16 @@ struct smIdHasher { return id1 == id2; } +#else + size_t operator()(const smIdType theValue) const + { + return static_cast (theValue & std::numeric_limits::max()); + } + bool operator()(const smIdType& theValue1, const smIdType& theValue2) const + { + return theValue1 == theValue2; + } +#endif }; template inline smIdType ToSmIdType(T val) diff --git a/src/ResourcesManager/CMakeLists.txt b/src/ResourcesManager/CMakeLists.txt index de36aae75..34f6e1259 100644 --- a/src/ResourcesManager/CMakeLists.txt +++ b/src/ResourcesManager/CMakeLists.txt @@ -18,15 +18,15 @@ # INCLUDE_DIRECTORIES( - ${LIBXML2_INCLUDE_DIR} - ${PTHREAD_INCLUDE_DIR} - ${OMNIORB_INCLUDE_DIR} - ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService ${CMAKE_CURRENT_SOURCE_DIR}/../Utils ${PROJECT_BINARY_DIR}/idl + ${LIBXML2_INCLUDE_DIR} + ${PTHREAD_INCLUDE_DIR} + ${OMNIORB_INCLUDE_DIR} + ${PROJECT_BINARY_DIR}/salome_adm ) diff --git a/src/SALOMELocalTrace/CMakeLists.txt b/src/SALOMELocalTrace/CMakeLists.txt index 4f03d0a04..5372a7968 100644 --- a/src/SALOMELocalTrace/CMakeLists.txt +++ b/src/SALOMELocalTrace/CMakeLists.txt @@ -18,7 +18,6 @@ # INCLUDE_DIRECTORIES( - ${PTHREAD_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${PTHREAD_INCLUDE_DIR} ) diff --git a/src/SALOMELocalTrace/Test/CMakeLists.txt b/src/SALOMELocalTrace/Test/CMakeLists.txt index ae74f1419..990bea629 100644 --- a/src/SALOMELocalTrace/Test/CMakeLists.txt +++ b/src/SALOMELocalTrace/Test/CMakeLists.txt @@ -18,11 +18,11 @@ # INCLUDE_DIRECTORIES( - ${CPPUNIT_INCLUDE_DIRS} - ${PTHREAD_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace + ${CPPUNIT_INCLUDE_DIRS} + ${PTHREAD_INCLUDE_DIR} ) ADD_DEFINITIONS(${CPPUNIT_DEFINITIONS}) diff --git a/src/SALOMETraceCollector/CMakeLists.txt b/src/SALOMETraceCollector/CMakeLists.txt index 60630e987..12fef2047 100644 --- a/src/SALOMETraceCollector/CMakeLists.txt +++ b/src/SALOMETraceCollector/CMakeLists.txt @@ -18,17 +18,16 @@ # INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIR} - ${PTHREAD_INCLUDE_DIR} - ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../ArgvKeeper ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../Utils ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace - ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService ${CMAKE_CURRENT_SOURCE_DIR}/../Logger ${PROJECT_BINARY_DIR}/idl + ${OMNIORB_INCLUDE_DIR} + ${PTHREAD_INCLUDE_DIR} + ${PROJECT_BINARY_DIR}/salome_adm ) ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PTHREAD_DEFINITIONS}) diff --git a/src/SALOMETraceCollector/Test/CMakeLists.txt b/src/SALOMETraceCollector/Test/CMakeLists.txt index 00a6fa0b0..5417cfb1e 100644 --- a/src/SALOMETraceCollector/Test/CMakeLists.txt +++ b/src/SALOMETraceCollector/Test/CMakeLists.txt @@ -18,13 +18,13 @@ # INCLUDE_DIRECTORIES( - ${CPPUNIT_INCLUDE_DIRS} - ${PTHREAD_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace/Test ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMETraceCollector + ${CPPUNIT_INCLUDE_DIRS} + ${PTHREAD_INCLUDE_DIR} ) SET(COMMON_LIBS diff --git a/src/TOOLSDS/CMakeLists.txt b/src/TOOLSDS/CMakeLists.txt index c5bede84b..54d3c0040 100644 --- a/src/TOOLSDS/CMakeLists.txt +++ b/src/TOOLSDS/CMakeLists.txt @@ -18,15 +18,15 @@ # INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace + ${CMAKE_CURRENT_SOURCE_DIR}/../Basics + ${CMAKE_CURRENT_SOURCE_DIR}/../Utils + ${PROJECT_BINARY_DIR}/idl ${OMNIORB_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/salome_adm - ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace - ${CMAKE_CURRENT_SOURCE_DIR}/../Basics - ${CMAKE_CURRENT_SOURCE_DIR}/../Utils - ${PROJECT_BINARY_DIR}/idl ) ADD_LIBRARY(TOOLSDS SALOMEDS_Tool.cxx) diff --git a/src/TestContainer/CMakeLists.txt b/src/TestContainer/CMakeLists.txt index 6b2c63cf9..e78ca116e 100644 --- a/src/TestContainer/CMakeLists.txt +++ b/src/TestContainer/CMakeLists.txt @@ -18,9 +18,6 @@ # INCLUDE_DIRECTORIES( - ${PTHREAD_INCLUDE_DIR} - ${OMNIORB_INCLUDE_DIR} - ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../ArgvKeeper ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace @@ -32,6 +29,9 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../Container ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj ${PROJECT_BINARY_DIR}/idl + ${PTHREAD_INCLUDE_DIR} + ${OMNIORB_INCLUDE_DIR} + ${PROJECT_BINARY_DIR}/salome_adm ) SET(SalomeTestComponentEngine_SOURCES diff --git a/src/TestMPIContainer/CMakeLists.txt b/src/TestMPIContainer/CMakeLists.txt index 81c402d29..204269539 100644 --- a/src/TestMPIContainer/CMakeLists.txt +++ b/src/TestMPIContainer/CMakeLists.txt @@ -18,9 +18,6 @@ # INCLUDE_DIRECTORIES( - ${MPI_CXX_INCLUDE_PATH} - ${OMNIORB_INCLUDE_DIR} - ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../ArgvKeeper ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace @@ -33,6 +30,9 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../MPIContainer ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj ${PROJECT_BINARY_DIR}/idl + ${MPI_CXX_INCLUDE_PATH} + ${OMNIORB_INCLUDE_DIR} + ${PROJECT_BINARY_DIR}/salome_adm ) ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${MPI_DEFINITIONS}) diff --git a/src/UnitTests/CMakeLists.txt b/src/UnitTests/CMakeLists.txt index 15057a4c1..9978d708f 100644 --- a/src/UnitTests/CMakeLists.txt +++ b/src/UnitTests/CMakeLists.txt @@ -18,13 +18,13 @@ # INCLUDE_DIRECTORIES( - ${CPPUNIT_INCLUDE_DIRS} - ${PTHREAD_INCLUDE_DIR} - ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../Basics/Test ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace/Test + ${CPPUNIT_INCLUDE_DIRS} + ${PTHREAD_INCLUDE_DIR} + ${PROJECT_BINARY_DIR}/salome_adm ) # =============================================================== diff --git a/src/Utils/CMakeLists.txt b/src/Utils/CMakeLists.txt index 1c923ca22..26f9560bb 100644 --- a/src/Utils/CMakeLists.txt +++ b/src/Utils/CMakeLists.txt @@ -20,14 +20,14 @@ IF(NOT SALOME_LIGHT_ONLY) INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIR} - ${PTHREAD_INCLUDE_DIR} - ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ArgvKeeper ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${PROJECT_BINARY_DIR}/idl + ${OMNIORB_INCLUDE_DIR} + ${PTHREAD_INCLUDE_DIR} + ${PROJECT_BINARY_DIR}/salome_adm ) ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PTHREAD_DEFINITIONS}) SET(COMMON_LIBS @@ -54,12 +54,12 @@ IF(NOT SALOME_LIGHT_ONLY) ELSE() INCLUDE_DIRECTORIES( - ${PTHREAD_INCLUDE_DIR} - ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ArgvKeeper ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace + ${PTHREAD_INCLUDE_DIR} + ${PROJECT_BINARY_DIR}/salome_adm ) SET(COMMON_LIBS ArgvKeeper diff --git a/src/Utils/Test/CMakeLists.txt b/src/Utils/Test/CMakeLists.txt index 70f06e7ec..08c26b9dc 100644 --- a/src/Utils/Test/CMakeLists.txt +++ b/src/Utils/Test/CMakeLists.txt @@ -18,8 +18,6 @@ # INCLUDE_DIRECTORIES( - ${PTHREAD_INCLUDE_DIR} - ${CPPUNIT_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace @@ -28,6 +26,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMETraceCollector/Test ${CMAKE_CURRENT_SOURCE_DIR}/../../Utils ${CMAKE_CURRENT_SOURCE_DIR}/../../Utils/Test + ${PTHREAD_INCLUDE_DIR} + ${CPPUNIT_INCLUDE_DIRS} ) SET(COMMON_LIBS -- 2.30.2