X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM%2FCMakeLists.txt;h=30ec5585ef21295e94addd467c9dba0bc07a424d;hb=9fe1f193a471c9610768d80f61c7cb09b5e3464a;hp=2c0c7605c012cc481f8bf35f98b5686250af88d2;hpb=ec168c32f86cab8199030ec4e8e2b1cbd5e42670;p=modules%2Fgeom.git diff --git a/src/GEOM/CMakeLists.txt b/src/GEOM/CMakeLists.txt index 2c0c7605c..30ec5585e 100755 --- a/src/GEOM/CMakeLists.txt +++ b/src/GEOM/CMakeLists.txt @@ -21,7 +21,7 @@ # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/SKETCHER @@ -30,24 +30,17 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES - ${CAS_OCAFVIS} - ${CAS_TKLCAF} - ${CAS_TKCDF} - ${CAS_TKG3d} + ${OpenCASCADE_ApplicationFramework_LIBRARIES} ${OpenCASCADE_ModelingData_LIBRARIES} ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} GEOMSketcher ) -IF(CAS_VERSION_STR VERSION_GREATER "7.0.0") - LIST(APPEND _link_LIBRARIES ${CAS_TKStd} ${CAS_TKBin}) -ENDIF() - # --- headers --- SET(GEOM_HEADERS