Migration to OpenCASCADE CMake configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf7e5bc345c0774367cbe53ecd1016737787ebcb..65290ca1791b4b00c22409558f8e3fd9a37f0301 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,7 +156,7 @@ ELSE()
   FIND_PACKAGE(SalomePyQt5 REQUIRED)
 ENDIF()
 # OCCT
-FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
 
 # Find GEOM
 # ===========
@@ -191,9 +191,6 @@ ENDIF(EXISTS ${SMESH_ROOT_DIR})
 # MedFile
 FIND_PACKAGE(SalomeMEDFile REQUIRED)
 
-# OpenCASCADE
-FIND_PACKAGE(SalomeCAS REQUIRED)
-
 # TBB
 IF(FRONTTRACK_USE_TBB)
   FIND_PACKAGE(SalomeTBB)

diff --git a/src/FrontTrack/CMakeLists.txt b/src/FrontTrack/CMakeLists.txt
index 8f4969789a9949549c44b008fa28e3b08e8be9d6..f22855b5dca784a92b543e4fbf4fe2da2faa2a6d 100755 (executable)
--- a/src/FrontTrack/CMakeLists.txt
+++ b/src/FrontTrack/CMakeLists.txt
@@ -1,7 +1,7 @@
 # --- options ---
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
   ${MEDFILE_INCLUDE_DIRS}
@@ -11,7 +11,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -21,13 +21,9 @@ ENDIF(FRONTTRACK_USE_TBB)
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_TKShHealing}
-  ${CAS_TKernel}
-  ${CAS_TKBRep}
-  ${CAS_TKG3d}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKGeomBase}
-  ${CAS_TKGeomAlgo}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
+  ${OpenCASCADE_ModelingData_LIBRARIES}
   ${GEOM_XAO}
   ${MEDCoupling_medloader}
   ${TBB_LIBS}

diff --git a/src/HOMARDGUI/CMakeLists.txt b/src/HOMARDGUI/CMakeLists.txt
index 087093548007dc109db90c1d44bafc8825356dae..94b26dfd2dc88274e3ab5306dedaeecd5ec7d1d4 100644 (file)
--- a/src/HOMARDGUI/CMakeLists.txt
+++ b/src/HOMARDGUI/CMakeLists.txt
@@ -25,7 +25,7 @@ INCLUDE(UsePyQt)
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
   ${MEDFILE_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
@@ -46,7 +46,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   ${BOOST_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${KERNEL_DEFINITIONS}
 )