From 9fe1f193a471c9610768d80f61c7cb09b5e3464a Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 15 Feb 2017 18:11:32 +0300 Subject: [PATCH] Migration to OpenCASCADE CMake configuration --- CMakeLists.txt | 10 +++++----- SalomeGEOMConfig.cmake.in | 2 +- src/ARCHIMEDE/CMakeLists.txt | 9 +++++---- src/AdvancedEngine/CMakeLists.txt | 4 ++-- src/AdvancedGUI/CMakeLists.txt | 4 ++-- src/BREPPlugin/CMakeLists.txt | 6 +++--- src/BasicGUI/CMakeLists.txt | 4 ++-- src/BlockFix/CMakeLists.txt | 9 ++++----- src/BlocksGUI/CMakeLists.txt | 4 ++-- src/BooleanGUI/CMakeLists.txt | 4 ++-- src/BuildGUI/CMakeLists.txt | 4 ++-- src/CurveCreator/CMakeLists.txt | 4 ++-- src/DependencyTree/CMakeLists.txt | 4 ++-- src/DisplayGUI/CMakeLists.txt | 4 ++-- src/EntityGUI/CMakeLists.txt | 4 ++-- src/GEOM/CMakeLists.txt | 12 +++--------- src/GEOMAlgo/CMakeLists.txt | 8 ++++---- src/GEOMBase/CMakeLists.txt | 4 ++-- src/GEOMClient/CMakeLists.txt | 6 +++--- src/GEOMFiltersSelection/CMakeLists.txt | 6 +++--- src/GEOMGUI/CMakeLists.txt | 4 ++-- src/GEOMImpl/CMakeLists.txt | 7 +++---- src/GEOMToolsGUI/CMakeLists.txt | 4 ++-- src/GEOMUtils/CMakeLists.txt | 14 +++++--------- src/GEOM_I/CMakeLists.txt | 4 ++-- src/GEOM_I_Superv/CMakeLists.txt | 2 +- src/GEOM_SWIG_WITHIHM/CMakeLists.txt | 4 ++-- src/GenerationGUI/CMakeLists.txt | 4 ++-- src/GroupGUI/CMakeLists.txt | 4 ++-- src/IGESPlugin/CMakeLists.txt | 6 +++--- src/Material/CMakeLists.txt | 6 +++--- src/MeasureGUI/CMakeLists.txt | 4 ++-- src/OBJECT/CMakeLists.txt | 8 ++++---- src/OCC2VTK/CMakeLists.txt | 9 ++++----- src/OperationGUI/CMakeLists.txt | 4 ++-- src/PrimitiveGUI/CMakeLists.txt | 4 ++-- src/RepairGUI/CMakeLists.txt | 4 ++-- src/SKETCHER/CMakeLists.txt | 11 +++++------ src/STEPPlugin/CMakeLists.txt | 7 +++---- src/STLPlugin/CMakeLists.txt | 6 +++--- src/ShHealOper/CMakeLists.txt | 6 +++--- src/ShapeRecognition/CMakeLists.txt | 2 -- src/ShapeRecognition/ShapeRec_FeatureDetector.hxx | 7 +++++++ src/TransformationGUI/CMakeLists.txt | 4 ++-- src/VTKPlugin/CMakeLists.txt | 5 ++--- src/XAO/CMakeLists.txt | 7 ++++--- src/XAO/tests/CMakeLists.txt | 4 ++-- src/XAOPlugin/CMakeLists.txt | 5 ++--- src/XAO_Swig/CMakeLists.txt | 4 ++-- 49 files changed, 131 insertions(+), 141 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75992c6a3..b19f314b9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,7 +156,7 @@ ENDIF(SALOME_BUILD_GUI) ## GEOM specifics ## -FIND_PACKAGE(SalomeCAS REQUIRED) +FIND_PACKAGE(SalomeOpenCASCADE REQUIRED) IF(SALOME_GEOM_USE_VTK) FIND_PACKAGE(SalomeVTK REQUIRED) @@ -286,20 +286,20 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} # Ensure the variables are always defined for the configure: SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}") SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}") -SET(CAS_ROOT_DIR "${CAS_ROOT_DIR}") +SET(OPENCASCADE_ROOT_DIR "${OPENCASCADE_ROOT_DIR}") SET(VTK_ROOT_DIR "${VTK_ROOT_DIR}") SET(OPENCV_ROOT_DIR "${OPENCV_ROOT_DIR}") SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include") # Build variables that will be expanded when configuring SalomeConfig.cmake: -SALOME_CONFIGURE_PREPARE(OpenCV CAS VTK) +SALOME_CONFIGURE_PREPARE(OpenCV OpenCASCADE VTK) CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX - KERNEL_ROOT_DIR GUI_ROOT_DIR CAS_ROOT_DIR VTK_ROOT_DIR OPENCV_ROOT_DIR) + KERNEL_ROOT_DIR GUI_ROOT_DIR OPENCASCADE_ROOT_DIR VTK_ROOT_DIR OPENCV_ROOT_DIR) # - in the install tree (VSR 16/08/2013: TEMPORARILY COMMENT THIS - TO REMOVE?): # Get the relative path of the include directory so @@ -309,7 +309,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in # ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake # INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE}" # PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE CMAKE_INSTALL_PREFIX -# KERNEL_ROOT_DIR GUI_ROOT_DIR CAS_ROOT_DIR VTK_ROOT_DIR OPENCV_ROOT_DIR) +# KERNEL_ROOT_DIR GUI_ROOT_DIR OPENCASCADE_ROOT_DIR VTK_ROOT_DIR OPENCV_ROOT_DIR) WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${${PROJECT_NAME_UC}_VERSION} diff --git a/SalomeGEOMConfig.cmake.in b/SalomeGEOMConfig.cmake.in index 175fa3d2c..d6dc181ab 100644 --- a/SalomeGEOMConfig.cmake.in +++ b/SalomeGEOMConfig.cmake.in @@ -57,7 +57,7 @@ SET(SALOME_GEOM_USE_VTK @SALOME_GEOM_USE_VTK@) # Level 1 prerequisites: SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@") -SET_AND_CHECK(CAS_ROOT_DIR_EXP "@PACKAGE_CAS_ROOT_DIR@") +SET_AND_CHECK(OPENCASCADE_ROOT_DIR_EXP "@PACKAGE_OPENCASCADE_ROOT_DIR@") # Optional level 1 prerequisites: IF(SALOME_GEOM_BUILD_GUI) diff --git a/src/ARCHIMEDE/CMakeLists.txt b/src/ARCHIMEDE/CMakeLists.txt index b703f4abc..bc9333f9e 100755 --- a/src/ARCHIMEDE/CMakeLists.txt +++ b/src/ARCHIMEDE/CMakeLists.txt @@ -21,19 +21,20 @@ # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ) # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) # libraries to link to -SET(_link_LIBRARIES - ${CAS_KERNEL} ${CAS_MODELER} ${CAS_TKMesh} +SET(_link_LIBRARIES + ${OpenCASCADE_FoundationClasses_LIBRARIES} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${KERNEL_SALOMELocalTrace} ) diff --git a/src/AdvancedEngine/CMakeLists.txt b/src/AdvancedEngine/CMakeLists.txt index f5aafa1ef..a3c228389 100755 --- a/src/AdvancedEngine/CMakeLists.txt +++ b/src/AdvancedEngine/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/GEOMImpl ${PROJECT_SOURCE_DIR}/src/GEOM @@ -37,7 +37,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) diff --git a/src/AdvancedGUI/CMakeLists.txt b/src/AdvancedGUI/CMakeLists.txt index d8981ab14..c909e35c9 100755 --- a/src/AdvancedGUI/CMakeLists.txt +++ b/src/AdvancedGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -48,7 +48,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/BREPPlugin/CMakeLists.txt b/src/BREPPlugin/CMakeLists.txt index 318debd16..754e2d6d2 100644 --- a/src/BREPPlugin/CMakeLists.txt +++ b/src/BREPPlugin/CMakeLists.txt @@ -25,7 +25,7 @@ ENDIF() # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/GEOMAlgo @@ -47,7 +47,7 @@ ENDIF() # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) @@ -63,7 +63,7 @@ ENDIF() # libraries to link to SET(_link_engine_LIBRARIES - ${CAS_TKBREP} + ${OpenCASCADE_ModelingData_LIBRARIES} ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} SalomeIDLGEOM diff --git a/src/BasicGUI/CMakeLists.txt b/src/BasicGUI/CMakeLists.txt index 64f157654..054431a00 100755 --- a/src/BasicGUI/CMakeLists.txt +++ b/src/BasicGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -44,7 +44,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/BlockFix/CMakeLists.txt b/src/BlockFix/CMakeLists.txt index 66b4a17ef..a9086710f 100755 --- a/src/BlockFix/CMakeLists.txt +++ b/src/BlockFix/CMakeLists.txt @@ -21,7 +21,7 @@ # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} @@ -29,14 +29,13 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES - ${CAS_KERNEL} - ${CAS_TKOffset} ${CAS_TKBool} ${CAS_TKBO} - ${CAS_TKShHealing} + ${OpenCASCADE_FoundationClasses_LIBRARIES} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${KERNEL_SALOMELocalTrace} ) diff --git a/src/BlocksGUI/CMakeLists.txt b/src/BlocksGUI/CMakeLists.txt index 9da8499d4..13257d4fe 100755 --- a/src/BlocksGUI/CMakeLists.txt +++ b/src/BlocksGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -44,7 +44,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/BooleanGUI/CMakeLists.txt b/src/BooleanGUI/CMakeLists.txt index 114cd639b..dbede3706 100755 --- a/src/BooleanGUI/CMakeLists.txt +++ b/src/BooleanGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -44,7 +44,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/BuildGUI/CMakeLists.txt b/src/BuildGUI/CMakeLists.txt index 125740200..5cbbdbc19 100755 --- a/src/BuildGUI/CMakeLists.txt +++ b/src/BuildGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -44,7 +44,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/CurveCreator/CMakeLists.txt b/src/CurveCreator/CMakeLists.txt index c4981791c..ca9625875 100644 --- a/src/CurveCreator/CMakeLists.txt +++ b/src/CurveCreator/CMakeLists.txt @@ -26,7 +26,7 @@ ENDIF(SALOME_BUILD_GUI) # additional include directories INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/GEOMUtils @@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/DependencyTree/CMakeLists.txt b/src/DependencyTree/CMakeLists.txt index e233bf9ca..9c5543dae 100644 --- a/src/DependencyTree/CMakeLists.txt +++ b/src/DependencyTree/CMakeLists.txt @@ -25,7 +25,7 @@ INCLUDE(UseQtExt) INCLUDE_DIRECTORIES( ${QT_INCLUDES} ${GUI_INCLUDE_DIRS} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/src/GEOMGUI ${PROJECT_SOURCE_DIR}/src/GEOMBase ${PROJECT_SOURCE_DIR}/src/GEOM @@ -40,7 +40,7 @@ ADD_DEFINITIONS( ${QT_DEFINITIONS} ${GUI_DEFINITIONS} ${OMNIORB_DEFINITIONS} - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) IF(WIN32) ADD_DEFINITIONS(-DNOGDI) diff --git a/src/DisplayGUI/CMakeLists.txt b/src/DisplayGUI/CMakeLists.txt index b9e0a8cdf..554b1fba9 100755 --- a/src/DisplayGUI/CMakeLists.txt +++ b/src/DisplayGUI/CMakeLists.txt @@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -38,7 +38,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/EntityGUI/CMakeLists.txt b/src/EntityGUI/CMakeLists.txt index c42e5095d..c1cdaa3f3 100755 --- a/src/EntityGUI/CMakeLists.txt +++ b/src/EntityGUI/CMakeLists.txt @@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES( ${VTK_INCLUDE_DIRS} ${OPENCV_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -50,7 +50,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ${OPENCV_DEFINITIONS} diff --git a/src/GEOM/CMakeLists.txt b/src/GEOM/CMakeLists.txt index 9a34d081b..30ec5585e 100755 --- a/src/GEOM/CMakeLists.txt +++ b/src/GEOM/CMakeLists.txt @@ -21,7 +21,7 @@ # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/SKETCHER @@ -30,18 +30,12 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES - ${CAS_OCAFVIS} - ${CAS_TKLCAF} - ${CAS_TKCDF} - ${CAS_TKG3d} - ${CAS_TKStdL} - ${CAS_TKStd} - ${CAS_TKBin} + ${OpenCASCADE_ApplicationFramework_LIBRARIES} ${OpenCASCADE_ModelingData_LIBRARIES} ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} GEOMSketcher diff --git a/src/GEOMAlgo/CMakeLists.txt b/src/GEOMAlgo/CMakeLists.txt index 3e3c48620..7ac192420 100755 --- a/src/GEOMAlgo/CMakeLists.txt +++ b/src/GEOMAlgo/CMakeLists.txt @@ -21,7 +21,7 @@ # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/GEOMUtils ${PROJECT_SOURCE_DIR}/src/GEOM @@ -30,12 +30,13 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES - ${CAS_KERNEL} ${CAS_TKBool} ${CAS_TKBO} ${CAS_TKMesh} + ${OpenCASCADE_FoundationClasses_LIBRARIES} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} GEOMbasic GEOMUtils ${KERNEL_SALOMELocalTrace} ) @@ -48,7 +49,6 @@ SET(GEOMAlgo_HEADERS GEOMAlgo_BndSphere.hxx GEOMAlgo_BndSphereTree.hxx GEOMAlgo_BoxBndTree.hxx - GEOMAlgo_BuilderShape.hxx GEOMAlgo_Clsf.hxx GEOMAlgo_ClsfBox.hxx GEOMAlgo_ClsfQuad.hxx diff --git a/src/GEOMBase/CMakeLists.txt b/src/GEOMBase/CMakeLists.txt index 772430005..c9c111fda 100755 --- a/src/GEOMBase/CMakeLists.txt +++ b/src/GEOMBase/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -42,7 +42,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/GEOMClient/CMakeLists.txt b/src/GEOMClient/CMakeLists.txt index 8f6a204f9..a22055769 100755 --- a/src/GEOMClient/CMakeLists.txt +++ b/src/GEOMClient/CMakeLists.txt @@ -22,7 +22,7 @@ # additional include directories INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -31,14 +31,14 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES SalomeIDLGEOM - ${CAS_TKBRep} + ${OpenCASCADE_ModelingData_LIBRARIES} ${KERNEL_SALOMELocalTrace} ) diff --git a/src/GEOMFiltersSelection/CMakeLists.txt b/src/GEOMFiltersSelection/CMakeLists.txt index 14b748cd6..c15263af0 100755 --- a/src/GEOMFiltersSelection/CMakeLists.txt +++ b/src/GEOMFiltersSelection/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) @@ -43,7 +43,7 @@ ADD_DEFINITIONS( SET(_link_LIBRARIES SalomeIDLGEOM GEOMClient - ${CAS_TKBRep} + ${OpenCASCADE_ModelingData_LIBRARIES} ${KERNEL_SALOMELocalTrace} ${GUI_SalomeApp} ) diff --git a/src/GEOMGUI/CMakeLists.txt b/src/GEOMGUI/CMakeLists.txt index 9dd7a50d8..db8aacf2c 100755 --- a/src/GEOMGUI/CMakeLists.txt +++ b/src/GEOMGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -42,7 +42,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ${OPENCV_DEFINITIONS} diff --git a/src/GEOMImpl/CMakeLists.txt b/src/GEOMImpl/CMakeLists.txt index 79b3a9b99..8eaa88a06 100755 --- a/src/GEOMImpl/CMakeLists.txt +++ b/src/GEOMImpl/CMakeLists.txt @@ -21,7 +21,7 @@ # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} @@ -39,14 +39,13 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${PYTHON_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES - ${CAS_TKFeat} - ${CAS_TKFillet} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${PYTHON_LIBRARIES} ShHealOper GEOMbasic BlockFix GEOMAlgo GEOMUtils GEOMSketcher GEOMArchimede XAO ${KERNEL_SALOMELocalTrace} diff --git a/src/GEOMToolsGUI/CMakeLists.txt b/src/GEOMToolsGUI/CMakeLists.txt index 520fe3ec2..50e8b799a 100755 --- a/src/GEOMToolsGUI/CMakeLists.txt +++ b/src/GEOMToolsGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -44,7 +44,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/GEOMUtils/CMakeLists.txt b/src/GEOMUtils/CMakeLists.txt index 7016ee564..86515758a 100755 --- a/src/GEOMUtils/CMakeLists.txt +++ b/src/GEOMUtils/CMakeLists.txt @@ -21,7 +21,7 @@ # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} @@ -30,19 +30,15 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${LIBXML2_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES - ${CAS_TKBRep} ${CAS_TKShHealing} ${CAS_TKMesh} ${CAS_TKGeomAlgo} - ${CAS_TKTopAlgo} - ${CAS_TKG2d} - ${CAS_TKG3d} - ${CAS_TKV3d} - ${CAS_TKGeomBase} - ${CAS_TKBO} + ${OpenCASCADE_ModelingData_LIBRARIES} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} + ${OpenCASCADE_Visualization_LIBRARIES} ${LIBXML2_LIBRARIES} ${KERNEL_SALOMELocalTrace} ) diff --git a/src/GEOM_I/CMakeLists.txt b/src/GEOM_I/CMakeLists.txt index aef81b998..4e7651403 100755 --- a/src/GEOM_I/CMakeLists.txt +++ b/src/GEOM_I/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/GEOMImpl ${PROJECT_SOURCE_DIR}/src/GEOM @@ -37,7 +37,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) diff --git a/src/GEOM_I_Superv/CMakeLists.txt b/src/GEOM_I_Superv/CMakeLists.txt index f2e8589e1..a2b02dce6 100755 --- a/src/GEOM_I_Superv/CMakeLists.txt +++ b/src/GEOM_I_Superv/CMakeLists.txt @@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) diff --git a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt index 16901f0ad..24e6c3ff5 100755 --- a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt +++ b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt @@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -47,7 +47,7 @@ SET_SOURCE_FILES_PROPERTIES(libGEOM_SwigPYTHON_wrap.cxx PROPERTIES COMPILE_FLAGS # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/GenerationGUI/CMakeLists.txt b/src/GenerationGUI/CMakeLists.txt index 57511ff0f..dd19de3ce 100755 --- a/src/GenerationGUI/CMakeLists.txt +++ b/src/GenerationGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -44,7 +44,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/GroupGUI/CMakeLists.txt b/src/GroupGUI/CMakeLists.txt index 44daf1f98..91e8eab61 100755 --- a/src/GroupGUI/CMakeLists.txt +++ b/src/GroupGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -46,7 +46,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/IGESPlugin/CMakeLists.txt b/src/IGESPlugin/CMakeLists.txt index 1951791e2..06bbac9f6 100644 --- a/src/IGESPlugin/CMakeLists.txt +++ b/src/IGESPlugin/CMakeLists.txt @@ -25,7 +25,7 @@ ENDIF() # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/GEOMAlgo @@ -47,7 +47,7 @@ ENDIF() # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) @@ -63,7 +63,7 @@ ENDIF() # libraries to link to SET(_link_engine_LIBRARIES - ${CAS_TKIGES} + ${OpenCASCADE_DataExchange_LIBRARIES} ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} SalomeIDLGEOM diff --git a/src/Material/CMakeLists.txt b/src/Material/CMakeLists.txt index 8d30a3493..0f6b20fd1 100755 --- a/src/Material/CMakeLists.txt +++ b/src/Material/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -37,7 +37,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) @@ -46,7 +46,7 @@ ADD_DEFINITIONS( SET(_link_LIBRARIES GEOMObject GEOMClient - ${CAS_TKBRep} + ${OpenCASCADE_ModelingData_LIBRARIES} ${KERNEL_SALOMELocalTrace} ${GUI_SalomeApp} ) diff --git a/src/MeasureGUI/CMakeLists.txt b/src/MeasureGUI/CMakeLists.txt index 7bbd75177..bd39b13a6 100755 --- a/src/MeasureGUI/CMakeLists.txt +++ b/src/MeasureGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -46,7 +46,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt index 4674ac750..d81339efe 100755 --- a/src/OBJECT/CMakeLists.txt +++ b/src/OBJECT/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${VTK_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -38,7 +38,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) @@ -47,8 +47,8 @@ ADD_DEFINITIONS( SET(_link_LIBRARIES OCC2VTK SalomeIDLGEOM - ${CAS_TKBRep} - ${CAS_TKOpenGl} + ${OpenCASCADE_ModelingData_LIBRARIES} + ${OpenCASCADE_Visualization_LIBRARIES} ${KERNEL_SALOMELocalTrace} ${GUI_SalomeObject} ${GUI_SVTK} diff --git a/src/OCC2VTK/CMakeLists.txt b/src/OCC2VTK/CMakeLists.txt index 677b78e0e..2bcd3c528 100755 --- a/src/OCC2VTK/CMakeLists.txt +++ b/src/OCC2VTK/CMakeLists.txt @@ -21,7 +21,7 @@ # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} @@ -30,15 +30,14 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES vtkFiltersCore - ${CAS_KERNEL} - ${CAS_TKMesh} ${CAS_TKTopAlgo} - ${CAS_MODELER} + ${OpenCASCADE_FoundationClasses_LIBRARIES} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${KERNEL_SALOMELocalTrace} GEOMUtils ) diff --git a/src/OperationGUI/CMakeLists.txt b/src/OperationGUI/CMakeLists.txt index 96ea57ecf..94cfc4c2d 100755 --- a/src/OperationGUI/CMakeLists.txt +++ b/src/OperationGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -45,7 +45,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/PrimitiveGUI/CMakeLists.txt b/src/PrimitiveGUI/CMakeLists.txt index feaa3fddc..81769bfdb 100755 --- a/src/PrimitiveGUI/CMakeLists.txt +++ b/src/PrimitiveGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/RepairGUI/CMakeLists.txt b/src/RepairGUI/CMakeLists.txt index adb30f598..be378a8e6 100755 --- a/src/RepairGUI/CMakeLists.txt +++ b/src/RepairGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -46,7 +46,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/SKETCHER/CMakeLists.txt b/src/SKETCHER/CMakeLists.txt index d33304540..edf52fef3 100755 --- a/src/SKETCHER/CMakeLists.txt +++ b/src/SKETCHER/CMakeLists.txt @@ -21,22 +21,21 @@ # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ) # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES - ${CAS_KERNEL} - ${CAS_TKGeomAlgo} ${CAS_TKTopAlgo} - ${CAS_TKBRep} - ${CAS_TKG2d} + ${OpenCASCADE_FoundationClasses_LIBRARIES} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} + ${OpenCASCADE_ModelingData_LIBRARIES} ${KERNEL_SALOMELocalTrace} ) diff --git a/src/STEPPlugin/CMakeLists.txt b/src/STEPPlugin/CMakeLists.txt index 43c32c141..f10b4550d 100644 --- a/src/STEPPlugin/CMakeLists.txt +++ b/src/STEPPlugin/CMakeLists.txt @@ -25,7 +25,7 @@ ENDIF() # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/GEOMAlgo @@ -47,7 +47,7 @@ ENDIF() # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) @@ -63,8 +63,7 @@ ENDIF() # libraries to link to SET(_link_engine_LIBRARIES - ${CAS_TKSTEP} - ${CAS_TKSTEPBase} + ${OpenCASCADE_DataExchange_LIBRARIES} ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} SalomeIDLGEOM diff --git a/src/STLPlugin/CMakeLists.txt b/src/STLPlugin/CMakeLists.txt index 6e95a8a94..5dff8b542 100644 --- a/src/STLPlugin/CMakeLists.txt +++ b/src/STLPlugin/CMakeLists.txt @@ -25,7 +25,7 @@ ENDIF() # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/GEOMAlgo @@ -47,7 +47,7 @@ ENDIF() # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) @@ -63,7 +63,7 @@ ENDIF() # libraries to link to SET(_link_engine_LIBRARIES - ${CAS_TKSTL} + ${OpenCASCADE_DataExchange_LIBRARIES} ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} SalomeIDLGEOM diff --git a/src/ShHealOper/CMakeLists.txt b/src/ShHealOper/CMakeLists.txt index 45a4f55c8..123c8b9ce 100755 --- a/src/ShHealOper/CMakeLists.txt +++ b/src/ShHealOper/CMakeLists.txt @@ -21,19 +21,19 @@ # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ) # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES - ${CAS_TKCAF} ${CAS_TKShHealing} ${CAS_TKBool} + ${OpenCASCADE_ApplicationFramework_LIBRARIES} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${KERNEL_SALOMELocalTrace} ) diff --git a/src/ShapeRecognition/CMakeLists.txt b/src/ShapeRecognition/CMakeLists.txt index 78372f5ac..dc550f509 100755 --- a/src/ShapeRecognition/CMakeLists.txt +++ b/src/ShapeRecognition/CMakeLists.txt @@ -22,7 +22,6 @@ # additional include directories INCLUDE_DIRECTORIES( - #${CAS_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${OPENCV_INCLUDE_DIR} ${QT_INCLUDES} @@ -31,7 +30,6 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - #${CAS_DEFINITIONS} ${QT_DEFINITIONS} ) IF(NOT SALOME_GUI_BUILD_WITH_QT5) diff --git a/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx b/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx index 1bd0a28be..7a9a0cec0 100644 --- a/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx +++ b/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx @@ -24,10 +24,17 @@ // Author : Renaud NEDELEC, Open CASCADE S.A.S. // OpenCV includes +// RNV: Workaround: HAVE_TBB definition from OCCT conflicts with OPENCV, undef it. +// This workaround will be removed after correction of the +// https://tracker.dev.opencascade.org/view.php?id=28457 issue. +#ifdef HAVE_TBB +#undef HAVE_TBB #include #include #include #include +#define HAVE_TBB +#endif // Qt #include diff --git a/src/TransformationGUI/CMakeLists.txt b/src/TransformationGUI/CMakeLists.txt index 4a87ff973..ae6b4ee87 100755 --- a/src/TransformationGUI/CMakeLists.txt +++ b/src/TransformationGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -44,7 +44,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) diff --git a/src/VTKPlugin/CMakeLists.txt b/src/VTKPlugin/CMakeLists.txt index d79e0e962..bde2a4380 100644 --- a/src/VTKPlugin/CMakeLists.txt +++ b/src/VTKPlugin/CMakeLists.txt @@ -25,7 +25,7 @@ ENDIF() # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -49,7 +49,7 @@ ENDIF() # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) @@ -65,7 +65,6 @@ ENDIF() # libraries to link to SET(_link_engine_LIBRARIES - ${CAS_TKVTK} ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} SalomeIDLGEOM diff --git a/src/XAO/CMakeLists.txt b/src/XAO/CMakeLists.txt index b746ea647..63dcdaf5f 100644 --- a/src/XAO/CMakeLists.txt +++ b/src/XAO/CMakeLists.txt @@ -27,20 +27,21 @@ ENDIF(SALOME_BUILD_TESTS) INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ) # additional preprocessor / compiler flags ADD_DEFINITIONS( ${LIBXML2_DEFINITIONS} - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES ${PTHREAD_LIBRARIES} ${LIBXML2_LIBRARIES} - ${CAS_TKBRep} ${CAS_TKTopAlgo} ${CAS_TKG2d} + ${OpenCASCADE_ModelingData_LIBRARIES} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ) # --- headers --- diff --git a/src/XAO/tests/CMakeLists.txt b/src/XAO/tests/CMakeLists.txt index 7bad36cea..c051b82f1 100644 --- a/src/XAO/tests/CMakeLists.txt +++ b/src/XAO/tests/CMakeLists.txt @@ -22,13 +22,13 @@ ADD_SUBDIRECTORY(data) # additional include directories INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${CPPUNIT_INCLUDE_DIRS} ) # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${CPPUNIT_DEFINITIONS} ) diff --git a/src/XAOPlugin/CMakeLists.txt b/src/XAOPlugin/CMakeLists.txt index a66566ad9..503b8324a 100644 --- a/src/XAOPlugin/CMakeLists.txt +++ b/src/XAOPlugin/CMakeLists.txt @@ -25,7 +25,7 @@ ENDIF() # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/GEOMAlgo @@ -49,7 +49,7 @@ ENDIF() # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) @@ -65,7 +65,6 @@ ENDIF() # libraries to link to SET(_link_engine_LIBRARIES - ${CAS_TKXAO} ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} SalomeIDLGEOM diff --git a/src/XAO_Swig/CMakeLists.txt b/src/XAO_Swig/CMakeLists.txt index 110c111aa..50606dc97 100644 --- a/src/XAO_Swig/CMakeLists.txt +++ b/src/XAO_Swig/CMakeLists.txt @@ -25,14 +25,14 @@ INCLUDE(${SWIG_USE_FILE}) INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/src/XAO ) # additional preprocessor / compiler flags ADD_DEFINITIONS( ${PYTHON_DEFINITIONS} - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) # libraries to link to -- 2.39.2