Migration to OpenCASCADE CMake configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a76f793f5c52864e3dc7e4e889a40b95baa5bff3..d97e4b17d56a7e9e1bf1bb8f7df86fb6cef4d92d 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,7 +132,7 @@ IF(SALOME_BUILD_GUI)
 ENDIF(SALOME_BUILD_GUI)
 
 # OCCT
-FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
 # VTK
 FIND_PACKAGE(SalomeVTK REQUIRED)
 

diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index c9d56b371daaa4ba81d9c4b098990e2ce8e92ff5..33c811b8a28affeb748dbbed5b6d8e9f141f3106 100644 (file)
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -25,7 +25,7 @@ INCLUDE(UseQtExt)
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${PYTHON_INCLUDES}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
@@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -52,7 +52,7 @@ SET(_link_LIBRARIES
   ${SMESH_SMESH}
   ${SMESH_StdMeshersGUI}
   ${SMESH_PluginUtils}
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${GUI_suit}
   ${GUI_qtx}
   ${GUI_SalomeApp}

diff --git a/src/HexoticPlugin/CMakeLists.txt b/src/HexoticPlugin/CMakeLists.txt
index 38e1ea402351e1626e349cce96327a22888d5e55..372510e714f7a7d8fb484930e7c02cfe3f7b3ea0 100644 (file)
--- a/src/HexoticPlugin/CMakeLists.txt
+++ b/src/HexoticPlugin/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES(
   ${SMESH_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${MESHGEMS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
@@ -36,17 +36,17 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(  
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_TKernel}
-  ${CAS_TKMath}
-  ${CAS_TKG3d}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKBRep}
+  TKernel
+  TKMath
+  TKG3d
+  TKTopAlgo
+  TKBRep
   ${CAS_SALOMELocalTrace}
   ${MESHGEMS_HEXA_LIBRARY}
   ${SMESH_SMESHimpl}