Migration to OpenCASCADE CMake configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6d89012519791d8295c532f6ca9209a25ff78a2..406764b2f5a949923e13a39e6dbb54edee0a1d60 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 ##
 ## From GUI:
 ##
-FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
 FIND_PACKAGE(SalomeSIP REQUIRED)  # should come after Python and before PyQt
 IF(NOT SALOME_GUI_BUILD_WITH_QT5)
   FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)

diff --git a/src/ATOMICGUI/CMakeLists.txt b/src/ATOMICGUI/CMakeLists.txt
index 861dd6be52e31524f5bcd7a21cf77a51091224b7..0ad561091f38f2d1099ebe3e480fd4addaca8491 100644 (file)
--- a/src/ATOMICGUI/CMakeLists.txt
+++ b/src/ATOMICGUI/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${GUI_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}
 )
@@ -31,7 +31,7 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
 )
 
 # libraries to link to