From 1cd77d21c8dd7c727549a52d5e21f9dd0b019566 Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 31 Jan 2018 16:27:08 +0300 Subject: [PATCH] OpenCASCADE Cmake configuration: continuation --- CMakeLists.txt | 3 --- src/FrontTrack/CMakeLists.txt | 14 +++++--------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77ce5de8..65290ca1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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} -- 2.39.2