ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-30 19:30:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Migration to OpenCASCADE CMake configuration

Browse Source
This commit is contained in:
rnv 2017-02-15 18:11:32 +03:00
parent 7e333dca6e
commit afe7ea2402
50 changed files with 131 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -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 Salome<MODULE>Config.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}

2
SalomeGEOMConfig.cmake.in
View File

@ -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)

2
doc/salome/examples/CMakeLists.txt
View File

@ -133,7 +133,7 @@ SET(GOOD_TESTS
working_with_groups_ex06.py
GEOM_Field.py
)
IF(CAS_VERSION_STR VERSION_GREATER "6.9.0")
IF(OpenCASCADE_VERSION_STR VERSION_GREATER "6.9.0")
LIST(APPEND GOOD_TESTS
check_self_intersections_fast.py
)

9
src/ARCHIMEDE/CMakeLists.txt
View File

@ -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}
)

4
src/AdvancedEngine/CMakeLists.txt
View File

@ -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}
)

4
src/AdvancedGUI/CMakeLists.txt
View File

@ -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}
)

6
src/BREPPlugin/CMakeLists.txt
View File

@ -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

4
src/BasicGUI/CMakeLists.txt
View File

@ -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}
)

9
src/BlockFix/CMakeLists.txt
View File

@ -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}
)

4
src/BlocksGUI/CMakeLists.txt
View File

@ -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}
)

4
src/BooleanGUI/CMakeLists.txt
View File

@ -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}
)

4
src/BuildGUI/CMakeLists.txt
View File

@ -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}
)

4
src/CurveCreator/CMakeLists.txt
View File

@ -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}
)

4
src/DependencyTree/CMakeLists.txt
View File

@ -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)

4
src/DisplayGUI/CMakeLists.txt
View File

@ -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}
)

4
src/EntityGUI/CMakeLists.txt
View File

@ -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
@ -49,7 +49,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${CAS_DEFINITIONS}
${OpenCASCADE_DEFINITIONS}
${OMNIORB_DEFINITIONS}
${QT_DEFINITIONS}
${OPENCV_DEFINITIONS}

13
src/GEOM/CMakeLists.txt
View File

@ -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,24 +30,17 @@ 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}
${OpenCASCADE_ApplicationFramework_LIBRARIES} ${OpenCASCADE_ModelingData_LIBRARIES}
${KERNEL_SALOMELocalTrace}
${KERNEL_OpUtil}
GEOMSketcher
)
IF(CAS_VERSION_STR VERSION_GREATER "7.0.0")
LIST(APPEND _link_LIBRARIES ${CAS_TKStd} ${CAS_TKBin})
ENDIF()
# --- headers ---
SET(GEOM_HEADERS

8
src/GEOMAlgo/CMakeLists.txt
View File

@ -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

4
src/GEOMBase/CMakeLists.txt
View File

@ -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}
)

6
src/GEOMClient/CMakeLists.txt
View File

@ -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}
)

6
src/GEOMFiltersSelection/CMakeLists.txt
View File

@ -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}
)

4
src/GEOMGUI/CMakeLists.txt
View File

@ -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}

7
src/GEOMImpl/CMakeLists.txt
View File

@ -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}

4
src/GEOMToolsGUI/CMakeLists.txt
View File

@ -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}
)

14
src/GEOMUtils/CMakeLists.txt
View File

@ -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}
)

4
src/GEOM_I/CMakeLists.txt
View File

@ -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}
)

2
src/GEOM_I_Superv/CMakeLists.txt
View File

@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${CAS_DEFINITIONS}
${OpenCASCADE_DEFINITIONS}
${OMNIORB_DEFINITIONS}
)

4
src/GEOM_SWIG_WITHIHM/CMakeLists.txt
View File

@ -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}
)

4
src/GenerationGUI/CMakeLists.txt
View File

@ -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}
)

4
src/GroupGUI/CMakeLists.txt
View File

@ -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}
)

6
src/IGESPlugin/CMakeLists.txt
View File

@ -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

6
src/Material/CMakeLists.txt
View File

@ -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}
)

4
src/MeasureGUI/CMakeLists.txt
View File

@ -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}
)

6
src/OBJECT/CMakeLists.txt
View File

@ -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,7 +47,7 @@ ADD_DEFINITIONS(
SET(_link_LIBRARIES
OCC2VTK
SalomeIDLGEOM
${CAS_TKBRep}
${OpenCASCADE_ModelingData_LIBRARIES}
${KERNEL_SALOMELocalTrace}
${GUI_SalomeObject}
${GUI_SVTK}

9
src/OCC2VTK/CMakeLists.txt
View File

@ -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
)

4
src/OperationGUI/CMakeLists.txt
View File

@ -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}
)

4
src/PrimitiveGUI/CMakeLists.txt
View File

@ -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}
)

4
src/RepairGUI/CMakeLists.txt
View File

@ -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}
)

11
src/SKETCHER/CMakeLists.txt
View File

@ -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}
)

7
src/STEPPlugin/CMakeLists.txt
View File

@ -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

6
src/STLPlugin/CMakeLists.txt
View File

@ -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

6
src/ShHealOper/CMakeLists.txt
View File

@ -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}
)

2
src/ShapeRecognition/CMakeLists.txt
View File

@ -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)

7
src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
View File

@ -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 <cv.h>
#include <highgui.h>
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/highgui/highgui.hpp>
#define HAVE_TBB
#endif
// Qt
#include <QRect>

4
src/TransformationGUI/CMakeLists.txt
View File

@ -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}
)

5
src/VTKPlugin/CMakeLists.txt
View File

@ -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

7
src/XAO/CMakeLists.txt
View File

@ -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 ---

4
src/XAO/tests/CMakeLists.txt
View File

@ -22,13 +22,13 @@
# 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}
)

5
src/XAOPlugin/CMakeLists.txt
View File

@ -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

4
src/XAO_Swig/CMakeLists.txt
View File

@ -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