From 148de0a5815927a47518aa1f76d690c4f443753e Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 15 Feb 2017 18:24:09 +0300 Subject: [PATCH] Migration to OpenCASCADE CMake configuration --- CMakeLists.txt | 5 +---- src/FrontTrack/CMakeLists.txt | 14 +++++--------- src/HOMARDGUI/CMakeLists.txt | 4 ++-- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf7e5bc3..65290ca1 100755 --- 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 8f496978..f22855b5 100755 --- 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 08709354..94b26dfd 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} ) -- 2.39.2