From 214e51351ceeb6445da84902479efb15f9d3ed9d Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 15 Feb 2017 18:31:51 +0300 Subject: [PATCH] Migration to OpenCASCADE CMake configuration --- CMakeLists.txt | 2 +- src/ATOMICGUI/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6d8901..406764b 100644 --- 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 861dd6b..0ad5610 100644 --- 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 -- 2.39.2