From: rnv Date: Wed, 15 Feb 2017 15:24:09 +0000 (+0300) Subject: Migration to OpenCASCADE CMake configuration X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=96ba0baececa04ab1512fbf9afa3bfc680de4fee;p=modules%2Fhomard.git Migration to OpenCASCADE CMake configuration --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 8142d43f..d2aeaec8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,7 +137,7 @@ ELSE() FIND_PACKAGE(SalomePyQt5 REQUIRED) ENDIF() # OCCT -FIND_PACKAGE(SalomeCAS REQUIRED) +FIND_PACKAGE(SalomeOpenCASCADE REQUIRED) # Find GEOM # =========== diff --git a/src/HOMARDGUI/CMakeLists.txt b/src/HOMARDGUI/CMakeLists.txt index 48382c78..a090e5dd 100644 --- 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} )